Author: stliu Date: 2010-03-23 17:14:04 -0400 (Tue, 23 Mar 2010) New Revision: 19092 Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AccessType.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Any.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDef.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDefs.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/BatchSize.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Cache.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Cascade.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Check.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/CollectionId.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/CollectionOfElements.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Columns.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Entity.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Fetch.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Filter.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterDef.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterDefs.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterJoinTable.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterJoinTables.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Filters.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ForceDiscriminator.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ForeignKey.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Formula.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Generated.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/GenericGenerator.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Immutable.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Index.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/IndexColumn.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/LazyCollection.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/LazyToOne.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Loader.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ManyToAny.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/MapKey.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedNativeQueries.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedNativeQuery.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedQueries.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedQuery.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NaturalId.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NotFound.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/OnDelete.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/OrderBy.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ParamDef.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Parameter.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Parent.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Persister.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Proxy.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLDelete.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLInsert.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLUpdate.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Sort.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Table.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tables.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Target.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizer.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizers.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Type.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/TypeDef.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/TypeDefs.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Where.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/WhereJoinTable.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/AnnotationBinder.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/Ejb3Column.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ExtendedMappings.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/InheritanceState.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/MapBinder.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/TableBinder.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Boat.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Company.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Country.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Customer.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Discount.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Flight.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/FlyingObject.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Passport.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Port.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Sky.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/TestCase.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Ticket.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/access/BigBed.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertyList.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertyMap.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertySet.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/package-info.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cascade/Mouth.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/AId.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/Order.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/OrderLine.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/OrderLinePk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ParentPk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvProgram.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/package-info.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Address.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Country.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/FixedLeg.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/FloatLeg.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/LegalStructure.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Person.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticle.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticlePk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Summary.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Flight.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Ransom.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/package-info.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Branch.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Person.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Stay.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/Dummy.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/StateType.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/WildEntity.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/Child.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/Ball.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/BreakDance.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/Bunny.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/FootballerPk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Ball.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/BreakDance.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Bunny.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Department.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/FootballerPk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Shoe.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Store.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/Passport.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/Stamp.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItems.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItemsPK.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Card.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/CardField.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/CardKey.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Customer.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Customers.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Project.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBasketsPK.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Store.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomer.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomerPK.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/A.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/BId.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/C.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/CId.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/Tomato.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/VegetablePk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Clothing.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/File.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Folder.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Parent.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Pool.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Folder.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/union/Folder.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/interfaces/UserImpl.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/A.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/B.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/C.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Cat.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Death.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/DogPk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Life.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/Team.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/CatPk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Company.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Friend.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Group.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Inspector.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/InspectorPrefixes.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/KnownClient.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Man.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/ManPk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Permission.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Store.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Supplier.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Woman.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/WomanPk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/BiggestForest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Carz.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Child.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Customer.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Deal.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/DistrictUser.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ForestType.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Lens.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Lotz.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/LotzPK.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Node.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/NodePk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Order.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/OrderLine.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Parent.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ParentPk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/TreeType.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/User.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/UserPK.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/GenericObject.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Item.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Vendor.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ZItemCost.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/State.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/notfound/Currency.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Child.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/City.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Order.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Person.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Street.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/Card.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/Deck.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Captain.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Chaos.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Night.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/Role.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/User.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/EJB3OverridenAnnotationReaderTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/strategy/Storm.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/Brand.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/Owner.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/TargetTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/Country.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/Cuisine.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DataProxyHandler.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicComponentTuplizer.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicEntityTuplizer.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicInstantiator.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/ProxyHelper.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/Antenna.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java Log: clean up unused imports Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AccessType.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AccessType.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AccessType.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,12 @@ //$Id$ package org.hibernate.annotations; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Any.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Any.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Any.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,11 +3,13 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static javax.persistence.FetchType.EAGER; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; + import javax.persistence.Column; import javax.persistence.FetchType; -import static javax.persistence.FetchType.EAGER; /** * Define a ToOne association pointing to several entity types. Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDef.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDef.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDef.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -5,9 +5,10 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; + /** * Defines @Any and @manyToAny metadata * Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDefs.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDefs.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/AnyMetaDefs.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,11 +3,10 @@ import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.FIELD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; + /** * Defines @Any and @ManyToAny set of metadata. * Can be defined at the entity level or the package level Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/BatchSize.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/BatchSize.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/BatchSize.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,12 @@ //$Id$ package org.hibernate.annotations; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Cache.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Cache.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Cache.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,12 @@ //$Id$ package org.hibernate.annotations; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Cascade.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Cascade.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Cascade.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Check.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Check.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Check.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,12 @@ //$Id$ package org.hibernate.annotations; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/CollectionId.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/CollectionId.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/CollectionId.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,11 +1,13 @@ //$Id$ package org.hibernate.annotations; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.FIELD; + import javax.persistence.Column; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/CollectionOfElements.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/CollectionOfElements.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/CollectionOfElements.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,11 +3,13 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static javax.persistence.FetchType.LAZY; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; + import javax.persistence.FetchType; -import static javax.persistence.FetchType.LAZY; /** * Annotation used to mark a collection as a collection of elements or Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Columns.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Columns.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Columns.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,9 +3,11 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; + import javax.persistence.Column; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ package org.hibernate.annotations; import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Entity.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Entity.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Entity.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ package org.hibernate.annotations; import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Fetch.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Fetch.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Fetch.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,10 @@ //$Id$ package org.hibernate.annotations; -import java.lang.annotation.Target; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Define the fetching strategy used for the given association Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Filter.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Filter.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Filter.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,12 @@ //$Id$ package org.hibernate.annotations; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterDef.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterDef.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterDef.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,8 +3,9 @@ import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterDefs.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterDefs.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterDefs.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,8 +3,9 @@ import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterJoinTable.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterJoinTable.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterJoinTable.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,10 @@ //$Id$ package org.hibernate.annotations; -import java.lang.annotation.Target; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import java.lang.annotation.ElementType; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Add filters to a join table collection Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterJoinTables.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterJoinTables.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/FilterJoinTables.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,10 @@ //$Id$ package org.hibernate.annotations; -import java.lang.annotation.Target; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import java.lang.annotation.ElementType; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Add multiple @FilterJoinTable to a collection Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Filters.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Filters.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Filters.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,12 @@ //$Id$ package org.hibernate.annotations; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ForceDiscriminator.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ForceDiscriminator.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ForceDiscriminator.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,10 @@ //$Id$ package org.hibernate.annotations; -import java.lang.annotation.Target; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * ForceDiscriminator flag Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ForeignKey.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ForeignKey.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ForeignKey.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -4,8 +4,9 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; @Target({FIELD, METHOD, TYPE}) Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Formula.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Formula.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Formula.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Generated.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Generated.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Generated.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,10 @@ //$Id$ package org.hibernate.annotations; -import java.lang.annotation.Target; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import java.lang.annotation.ElementType; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * The annotated property is generated by the database Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/GenericGenerator.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/GenericGenerator.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/GenericGenerator.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,13 @@ //$Id$ package org.hibernate.annotations; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PACKAGE; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Immutable.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Immutable.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Immutable.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,7 +1,9 @@ //$Id$ package org.hibernate.annotations; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; /** * Mark an Entity or a Collection as immutable. No annotation means the element is mutable. Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Index.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Index.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Index.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/IndexColumn.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/IndexColumn.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/IndexColumn.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/LazyCollection.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/LazyCollection.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/LazyCollection.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,10 @@ //$Id$ package org.hibernate.annotations; -import java.lang.annotation.Target; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import java.lang.annotation.ElementType; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Define the lazy status of a collection Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/LazyToOne.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/LazyToOne.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/LazyToOne.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,10 @@ //$Id$ package org.hibernate.annotations; -import java.lang.annotation.Target; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Define the lazy status of a ToOne association Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Loader.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Loader.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Loader.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,11 @@ package org.hibernate.annotations; -import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ManyToAny.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ManyToAny.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ManyToAny.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,13 +1,15 @@ //$Id$ package org.hibernate.annotations; +import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static javax.persistence.FetchType.EAGER; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; + import javax.persistence.Column; import javax.persistence.FetchType; -import static javax.persistence.FetchType.EAGER; /** * Defined a ToMany association pointing to different entity types. Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/MapKey.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/MapKey.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/MapKey.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,11 +1,13 @@ //$Id$ package org.hibernate.annotations; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.FIELD; + import javax.persistence.Column; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -5,6 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import javax.persistence.JoinColumn; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedNativeQueries.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedNativeQueries.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedNativeQueries.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedNativeQuery.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedNativeQuery.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedNativeQuery.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedQueries.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedQueries.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedQueries.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedQuery.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedQuery.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NamedQuery.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,8 +3,9 @@ import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NaturalId.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NaturalId.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NaturalId.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NotFound.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NotFound.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/NotFound.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/OnDelete.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/OnDelete.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/OnDelete.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,11 @@ package org.hibernate.annotations; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/OrderBy.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/OrderBy.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/OrderBy.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ParamDef.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ParamDef.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/ParamDef.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,9 @@ //$Id$ package org.hibernate.annotations; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Parameter.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Parameter.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Parameter.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,9 @@ //$Id$ package org.hibernate.annotations; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Parent.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Parent.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Parent.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,8 +3,9 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Persister.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Persister.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Persister.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,7 +1,9 @@ //$Id$ package org.hibernate.annotations; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; /** * Specify a custom persister. Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Proxy.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Proxy.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Proxy.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ package org.hibernate.annotations; import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLDelete.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLDelete.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLDelete.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,11 +1,12 @@ //$Id$ package org.hibernate.annotations; -import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLInsert.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLInsert.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLInsert.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,11 +1,12 @@ //$Id$ package org.hibernate.annotations; -import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLUpdate.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLUpdate.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/SQLUpdate.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,11 +1,12 @@ //$Id$ package org.hibernate.annotations; -import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Sort.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Sort.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Sort.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,8 +3,9 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Table.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Table.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Table.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ package org.hibernate.annotations; import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tables.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tables.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tables.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,9 @@ package org.hibernate.annotations; import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Target.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Target.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Target.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ //$Id$ package org.hibernate.annotations; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import java.lang.annotation.ElementType; import java.lang.annotation.RetentionPolicy; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizer.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizer.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizer.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,12 +1,13 @@ //$Id$ package org.hibernate.annotations; -import java.lang.annotation.*; -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; + /** * Define a tuplizer for an entity or a component * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizers.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizers.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Tuplizers.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ //$Id$ package org.hibernate.annotations; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import java.lang.annotation.ElementType; import java.lang.annotation.RetentionPolicy; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Type.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Type.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Type.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,8 +3,9 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/TypeDef.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/TypeDef.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/TypeDef.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,8 +3,9 @@ import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/TypeDefs.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/TypeDefs.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/TypeDefs.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,8 +3,9 @@ import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Where.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Where.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/Where.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,11 @@ package org.hibernate.annotations; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/WhereJoinTable.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/WhereJoinTable.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/annotations/WhereJoinTable.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,10 @@ //$Id$ package org.hibernate.annotations; -import java.lang.annotation.Target; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import java.lang.annotation.ElementType; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Where clause to add to the colleciton join table Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.util.HashMap; import java.util.Map; + import javax.persistence.AssociationOverride; import javax.persistence.AssociationOverrides; import javax.persistence.AttributeOverride; Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/AnnotationBinder.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -12,6 +12,7 @@ import java.util.Map; import java.util.Properties; import java.util.Set; + import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.DiscriminatorType; @@ -71,6 +72,7 @@ import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Formula; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.GenericGenerators; import org.hibernate.annotations.Index; import org.hibernate.annotations.LazyToOne; import org.hibernate.annotations.LazyToOneOption; @@ -94,7 +96,6 @@ import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDefs; import org.hibernate.annotations.Where; -import org.hibernate.annotations.GenericGenerators; import org.hibernate.annotations.common.reflection.ReflectionManager; import org.hibernate.annotations.common.reflection.XAnnotatedElement; import org.hibernate.annotations.common.reflection.XClass; Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.util.HashMap; import java.util.Map; + import javax.persistence.JoinTable; import org.hibernate.annotations.common.reflection.XClass; Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -4,10 +4,10 @@ import java.io.InputStream; import org.hibernate.util.DTDEntityResolver; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/Ejb3Column.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/Ejb3Column.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/Ejb3Column.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -13,8 +13,8 @@ import org.hibernate.mapping.SimpleValue; import org.hibernate.mapping.Table; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.slf4j.Logger; /** * Wrap state of an EJB3 @Column annotation Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -5,6 +5,7 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; + import javax.persistence.JoinColumn; import javax.persistence.PrimaryKeyJoinColumn; Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ExtendedMappings.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ExtendedMappings.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ExtendedMappings.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -6,6 +6,7 @@ import java.util.Map; import java.util.Properties; import java.util.Set; + import javax.persistence.Embeddable; import javax.persistence.Entity; import javax.persistence.MappedSuperclass; @@ -22,8 +23,8 @@ import org.hibernate.mapping.Join; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.slf4j.Logger; /** * Allow annotation related mappings Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/InheritanceState.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/InheritanceState.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/InheritanceState.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.cfg; import java.util.Map; + import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.MappedSuperclass; Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -7,13 +7,13 @@ import org.hibernate.AssertionFailure; import org.hibernate.MappingException; import org.hibernate.cfg.annotations.TableBinder; +import org.hibernate.mapping.Component; +import org.hibernate.mapping.KeyValue; import org.hibernate.mapping.ManyToOne; import org.hibernate.mapping.OneToOne; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.mapping.ToOne; -import org.hibernate.mapping.KeyValue; -import org.hibernate.mapping.Component; import org.hibernate.util.StringHelper; /** Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; + import javax.persistence.AttributeOverride; import javax.persistence.AttributeOverrides; import javax.persistence.Embeddable; Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -6,6 +6,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; + import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.JoinTable; Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/MapBinder.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/MapBinder.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/MapBinder.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -5,6 +5,7 @@ import java.util.Iterator; import java.util.Map; import java.util.Random; + import javax.persistence.AttributeOverride; import javax.persistence.AttributeOverrides; @@ -12,8 +13,8 @@ import org.hibernate.AssertionFailure; import org.hibernate.FetchMode; import org.hibernate.MappingException; +import org.hibernate.annotations.MapKey; import org.hibernate.annotations.MapKeyManyToMany; -import org.hibernate.annotations.MapKey; import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.reflection.XProperty; import org.hibernate.cfg.AnnotatedClassType; Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.cfg.annotations; import java.util.HashMap; + import javax.persistence.NamedNativeQueries; import javax.persistence.NamedNativeQuery; import javax.persistence.NamedQueries; Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; import java.util.Set; + import javax.persistence.ColumnResult; import javax.persistence.EntityResult; import javax.persistence.FieldResult; Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -6,6 +6,7 @@ import java.util.Calendar; import java.util.Date; import java.util.Properties; + import javax.persistence.Enumerated; import javax.persistence.Lob; import javax.persistence.Temporal; Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/TableBinder.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/TableBinder.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/TableBinder.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; + import javax.persistence.UniqueConstraint; import org.hibernate.AnnotationException; Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3OverridenAnnotationReader.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -13,6 +13,7 @@ import java.util.List; import java.util.Map; import java.util.Set; + import javax.persistence.AssociationOverride; import javax.persistence.AssociationOverrides; import javax.persistence.AttributeOverride; Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/EJB3ReflectionManager.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.persistence.EntityListeners; import javax.persistence.NamedNativeQuery; import javax.persistence.NamedQuery; Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -9,8 +9,8 @@ import org.dom4j.Document; import org.dom4j.Element; import org.hibernate.util.StringHelper; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.slf4j.Logger; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Boat.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Boat.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Boat.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Company.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Company.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Company.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import java.util.Set; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Country.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Country.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Country.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -6,6 +6,7 @@ */ import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Customer.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Customer.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Customer.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,12 @@ //$Id$ package org.hibernate.test.annotations; +import static org.hibernate.annotations.CascadeType.ALL; + import java.io.Serializable; import java.util.Collection; import java.util.SortedSet; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -14,7 +17,6 @@ import javax.persistence.OneToOne; import org.hibernate.annotations.Cascade; -import static org.hibernate.annotations.CascadeType.ALL; import org.hibernate.annotations.Sort; import org.hibernate.annotations.SortType; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Discount.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Discount.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Discount.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations; import java.io.Serializable; + import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Flight.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Flight.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Flight.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Calendar; import java.util.Date; + import javax.persistence.Basic; import javax.persistence.CascadeType; import javax.persistence.Column; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/FlyingObject.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/FlyingObject.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/FlyingObject.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.MappedSuperclass; import javax.persistence.Transient; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Passport.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Passport.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Passport.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Port.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Port.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Port.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations; import java.util.Set; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -4,6 +4,7 @@ import java.util.Properties; import junit.framework.TestCase; + import org.hibernate.HibernateException; import org.hibernate.SessionFactory; import org.hibernate.cfg.AnnotationConfiguration; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Sky.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Sky.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Sky.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/TestCase.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/TestCase.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/TestCase.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -11,9 +11,6 @@ import java.util.HashSet; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.HibernateException; import org.hibernate.Interceptor; import org.hibernate.Session; @@ -24,6 +21,8 @@ import org.hibernate.dialect.Dialect; import org.hibernate.jdbc.Work; import org.hibernate.tool.hbm2ddl.SchemaExport; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A base class for all tests. Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Ticket.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Ticket.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/Ticket.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/access/BigBed.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/access/BigBed.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/access/BigBed.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ //$Id$ package org.hibernate.test.annotations.access; +import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Column; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertyList.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertyList.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertyList.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,19 +2,20 @@ import java.util.ArrayList; import java.util.List; + +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; import javax.persistence.Table; -import javax.persistence.JoinTable; -import javax.persistence.Column; -import javax.persistence.JoinColumn; -import org.hibernate.annotations.ManyToAny; +import org.hibernate.annotations.Any; import org.hibernate.annotations.Cascade; +import org.hibernate.annotations.CascadeType; import org.hibernate.annotations.IndexColumn; -import org.hibernate.annotations.Any; -import org.hibernate.annotations.CascadeType; +import org.hibernate.annotations.ManyToAny; @Entity @Table( name = "property_list" ) Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertyMap.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertyMap.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertyMap.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ import java.util.HashMap; import java.util.Map; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertySet.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertySet.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/PropertySet.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/package-info.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/package-info.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/package-info.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -11,6 +11,6 @@ package org.hibernate.test.annotations.any; +import org.hibernate.annotations.AnyMetaDef; import org.hibernate.annotations.AnyMetaDefs; -import org.hibernate.annotations.AnyMetaDef; -import org.hibernate.annotations.MetaValue; \ No newline at end of file +import org.hibernate.annotations.MetaValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,11 +1,11 @@ //$Id$ package org.hibernate.test.annotations.bytecode; +import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.Hibernate; +import org.hibernate.cfg.Configuration; import org.hibernate.test.annotations.TestCase; -import org.hibernate.cfg.Configuration; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cascade/Mouth.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cascade/Mouth.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cascade/Mouth.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,12 +2,13 @@ package org.hibernate.test.annotations.cascade; import java.util.Collection; + import javax.persistence.CascadeType; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.OneToMany; -import javax.persistence.Column; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/AId.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/AId.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/AId.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.cid; import java.io.Serializable; + import javax.persistence.Embeddable; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ChildPk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.cid; import java.io.Serializable; + import javax.persistence.Embeddable; import javax.persistence.JoinColumn; import javax.persistence.JoinColumns; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -12,7 +12,6 @@ import org.hibernate.criterion.Disjunction; import org.hibernate.criterion.Restrictions; import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.HSQLDialect; import org.hibernate.test.annotations.TestCase; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/Order.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/Order.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/Order.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ package org.hibernate.test.annotations.cid; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.Table; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/OrderLine.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/OrderLine.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/OrderLine.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ package org.hibernate.test.annotations.cid; import javax.persistence.Entity; +import javax.persistence.Id; import javax.persistence.IdClass; -import javax.persistence.Id; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/OrderLinePk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/OrderLinePk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/OrderLinePk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,11 @@ package org.hibernate.test.annotations.cid; -import javax.persistence.ManyToOne; -import javax.persistence.JoinColumn; import java.io.Serializable; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; + /** * @author Emmanuel Bernard */ Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ParentPk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ParentPk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/ParentPk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.cid; import java.io.Serializable; + import javax.persistence.Column; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntity.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,10 @@ package org.hibernate.test.annotations.cid; import java.io.Serializable; + +import javax.persistence.Basic; import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.Basic; /** * @author bartek Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/SomeEntityId.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,9 @@ package org.hibernate.test.annotations.cid; import java.io.Serializable; + import javax.persistence.Embeddable; -import org.hibernate.annotations.*; - /** * @author bartek */ Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvMagazin.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.cid; import java.util.Date; + import javax.persistence.AssociationOverride; import javax.persistence.EmbeddedId; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvProgram.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvProgram.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvProgram.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.cid; import java.util.Date; + import javax.persistence.Column; import javax.persistence.EmbeddedId; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/TvProgramIdClass.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.cid; import java.util.Date; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -5,6 +5,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; + import javax.persistence.AttributeOverride; import javax.persistence.AttributeOverrides; import javax.persistence.Column; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,18 +1,19 @@ //$Id$ package org.hibernate.test.annotations.collectionelement; +import java.io.Serializable; import java.util.HashMap; +import java.util.Locale; import java.util.Map; -import java.util.Locale; -import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Embeddable; import org.hibernate.annotations.CollectionOfElements; import org.hibernate.annotations.Fetch; -import org.hibernate.annotations.MapKey; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.Filter; +import org.hibernate.annotations.MapKey; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -6,6 +6,7 @@ */ import java.util.List; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,11 +2,10 @@ package org.hibernate.test.annotations.collectionelement.deepcollectionelements; import java.util.List; + import javax.persistence.Embeddable; -import javax.persistence.Transient; import javax.persistence.OneToMany; -import org.hibernate.annotations.CollectionOfElements; import org.hibernate.annotations.IndexColumn; @Embeddable Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,10 +2,9 @@ package org.hibernate.test.annotations.collectionelement.deepcollectionelements; import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; @Entity Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ //$ package org.hibernate.test.annotations.collectionelement.indexedCollection; +import org.hibernate.Session; import org.hibernate.test.annotations.TestCase; -import org.hibernate.Session; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/Sale.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,19 +1,20 @@ //$ package org.hibernate.test.annotations.collectionelement.indexedCollection; +import java.util.ArrayList; import java.util.List; -import java.util.ArrayList; + +import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.JoinColumn; import javax.persistence.JoinTable; -import javax.persistence.Column; -import org.hibernate.annotations.Type; +import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.CollectionOfElements; -import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.Type; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.configuration; import junit.framework.TestCase; + import org.hibernate.cfg.AnnotationConfiguration; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/package-info.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/package-info.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/configuration/package-info.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,3 +2,4 @@ package org.hibernate.test.annotations.configuration; import org.hibernate.annotations.GenericGenerator; + Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.duplicatedgenerator; import junit.framework.TestCase; + import org.hibernate.AnnotationException; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Environment; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Address.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Address.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Address.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.embedded; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Embeddable; import javax.persistence.ManyToOne; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Country.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Country.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Country.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.embedded; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Embeddable; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/FixedLeg.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/FixedLeg.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/FixedLeg.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,6 +1,7 @@ package org.hibernate.test.annotations.embedded; import java.text.NumberFormat; + import javax.persistence.Embeddable; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/FloatLeg.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/FloatLeg.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/FloatLeg.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,6 +1,7 @@ package org.hibernate.test.annotations.embedded; import java.text.NumberFormat; + import javax.persistence.Embeddable; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/LegalStructure.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/LegalStructure.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/LegalStructure.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.util.HashSet; import java.util.Set; + import javax.persistence.Embeddable; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Person.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Person.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Person.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.embedded; import java.io.Serializable; + import javax.persistence.AttributeOverride; import javax.persistence.AttributeOverrides; import javax.persistence.Column; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticle.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticle.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticle.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.embedded; import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticlePk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticlePk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/RegionalArticlePk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.embedded; import java.io.Serializable; + import javax.persistence.Embeddable; import org.hibernate.annotations.AccessType; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Summary.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Summary.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/Summary.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ //$Id$ package org.hibernate.test.annotations.embedded; +import javax.persistence.Column; import javax.persistence.Embeddable; -import javax.persistence.Column; import org.hibernate.annotations.Parent; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Flight.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Flight.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Flight.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.entity; import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Inheritance; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,11 +3,7 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; -import org.hibernate.dialect.DB2Dialect; import org.hibernate.test.annotations.TestCase; -import org.hibernate.util.ConfigHelper; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Ransom.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Ransom.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Ransom.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.entity; import java.util.Date; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/package-info.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/package-info.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/package-info.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -32,3 +32,4 @@ import org.hibernate.annotations.Parameter; import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDefs; + Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entitynonentity/Interaction.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ //$Id$ package org.hibernate.test.annotations.entitynonentity; +import javax.persistence.Column; import javax.persistence.MappedSuperclass; -import javax.persistence.Column; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Branch.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Branch.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Branch.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,13 +1,14 @@ //$Id$ package org.hibernate.test.annotations.fetch; +import java.util.HashSet; import java.util.Set; -import java.util.HashSet; + +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.OneToMany; -import javax.persistence.Entity; -import javax.persistence.FetchType; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Person.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Person.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Person.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -6,6 +6,7 @@ import java.util.Collection; import java.util.Date; import java.util.List; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -16,9 +17,9 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; +import org.hibernate.annotations.IndexColumn; import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; -import org.hibernate.annotations.IndexColumn; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Stay.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Stay.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/Stay.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.io.Serializable; import java.util.Date; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -12,10 +13,10 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; +import org.hibernate.annotations.Fetch; +import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.LazyToOne; import org.hibernate.annotations.LazyToOneOption; -import org.hibernate.annotations.Fetch; -import org.hibernate.annotations.FetchMode; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/Dummy.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/Dummy.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/Dummy.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,9 @@ //$ package org.hibernate.test.annotations.generics; +import javax.persistence.Entity; +import javax.persistence.Id; import javax.persistence.Transient; -import javax.persistence.Id; -import javax.persistence.Entity; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/StateType.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/StateType.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/StateType.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,13 +2,13 @@ package org.hibernate.test.annotations.generics; import java.io.Serializable; +import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.PreparedStatement; import java.sql.Types; +import org.hibernate.HibernateException; import org.hibernate.usertype.UserType; -import org.hibernate.HibernateException; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/WildEntity.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/WildEntity.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/WildEntity.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.generics; import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/Child.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/Child.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/Child.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ package org.hibernate.test.annotations.genericsinheritance; -import javax.persistence.MappedSuperclass; import javax.persistence.Id; import javax.persistence.ManyToOne; +import javax.persistence.MappedSuperclass; @MappedSuperclass public abstract class Child<P extends Parent> { Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ //$Id$ package org.hibernate.test.annotations.genericsinheritance; +import org.hibernate.Session; import org.hibernate.test.annotations.TestCase; -import org.hibernate.Session; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/Ball.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/Ball.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/Ball.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.id.entities; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/BreakDance.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/BreakDance.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/BreakDance.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,10 +2,10 @@ package org.hibernate.test.annotations.id.entities; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.TableGenerator; -import javax.persistence.GenerationType; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/Bunny.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/Bunny.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/Bunny.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -5,8 +5,8 @@ import java.math.BigInteger; import java.util.Set; +import javax.persistence.CascadeType; import javax.persistence.Column; -import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/FootballerPk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/FootballerPk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/entities/FootballerPk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.id.entities; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Embeddable; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Ball.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Ball.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Ball.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.id.sequences.entities; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/BreakDance.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/BreakDance.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/BreakDance.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,10 +2,10 @@ package org.hibernate.test.annotations.id.sequences.entities; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.TableGenerator; -import javax.persistence.GenerationType; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Bunny.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Bunny.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Bunny.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -5,8 +5,8 @@ import java.math.BigInteger; import java.util.Set; +import javax.persistence.CascadeType; import javax.persistence.Column; -import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Department.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Department.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Department.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.id.sequences.entities; import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/FootballerPk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/FootballerPk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/FootballerPk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.id.sequences.entities; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Embeddable; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Shoe.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Shoe.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Shoe.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.id.sequences.entities; import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Store.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Store.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/entities/Store.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.id.sequences.entities; import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,9 @@ //$Id$ package org.hibernate.test.annotations.identifiercollection; -import org.hibernate.test.annotations.TestCase; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.test.annotations.TestCase; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/Passport.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/Passport.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/Passport.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.Collection; + import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/Stamp.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/Stamp.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/Stamp.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,8 @@ package org.hibernate.test.annotations.identifiercollection; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItems.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItems.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItems.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,17 +2,18 @@ package org.hibernate.test.annotations.idmanytoone; import java.io.Serializable; -import javax.persistence.IdClass; -import javax.persistence.Id; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; import javax.persistence.Column; -import javax.persistence.CascadeType; +import javax.persistence.Entity; import javax.persistence.FetchType; +import javax.persistence.Id; +import javax.persistence.IdClass; import javax.persistence.JoinColumn; +import javax.persistence.JoinColumns; +import javax.persistence.ManyToOne; import javax.persistence.Table; -import javax.persistence.ManyToOne; -import javax.persistence.Basic; -import javax.persistence.JoinColumns; -import javax.persistence.Entity; @Entity @Table(name="BasketItems") Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItemsPK.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItemsPK.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/BasketItemsPK.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,15 +2,16 @@ package org.hibernate.test.annotations.idmanytoone; import java.io.Serializable; + +import javax.persistence.Basic; import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.JoinColumns; -import javax.persistence.Column; import javax.persistence.ManyToOne; -import javax.persistence.Basic; -import javax.persistence.Embeddable; -import javax.persistence.FetchType; @Embeddable public class BasketItemsPK implements Serializable { Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Card.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Card.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Card.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,12 +3,13 @@ import java.io.Serializable; import java.util.Set; + +import javax.persistence.CascadeType; import javax.persistence.Embeddable; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.ManyToOne; -import javax.persistence.CascadeType; -import javax.persistence.FetchType; import javax.persistence.OneToMany; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/CardField.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/CardField.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/CardField.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,10 +2,11 @@ package org.hibernate.test.annotations.idmanytoone; import java.io.Serializable; + +import javax.persistence.Embeddable; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToOne; -import javax.persistence.Embeddable; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/CardKey.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/CardKey.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/CardKey.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,8 @@ package org.hibernate.test.annotations.idmanytoone; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Customer.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Customer.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Customer.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,11 +3,12 @@ import java.io.Serializable; import java.util.Set; -import javax.persistence.Table; + import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; import javax.persistence.OneToMany; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; +import javax.persistence.Table; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Customers.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Customers.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Customers.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,10 +2,11 @@ package org.hibernate.test.annotations.idmanytoone; import java.io.Serializable; -import javax.persistence.Id; + +import javax.persistence.CascadeType; import javax.persistence.Column; -import javax.persistence.CascadeType; import javax.persistence.Entity; +import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Project.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Project.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Project.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,8 @@ package org.hibernate.test.annotations.idmanytoone; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBasketsPK.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBasketsPK.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/ShoppingBasketsPK.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,15 +2,16 @@ package org.hibernate.test.annotations.idmanytoone; import java.io.Serializable; + +import javax.persistence.Basic; import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.FetchType; import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinColumns; import javax.persistence.ManyToOne; -import javax.persistence.JoinColumns; -import javax.persistence.FetchType; -import javax.persistence.Basic; -import javax.persistence.JoinColumn; -import javax.persistence.Column; -import javax.persistence.Embeddable; @Embeddable public class ShoppingBasketsPK implements Serializable { Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Store.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Store.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/Store.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,11 +3,12 @@ import java.io.Serializable; import java.util.Set; -import javax.persistence.Table; + import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; import javax.persistence.OneToMany; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; +import javax.persistence.Table; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomer.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomer.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomer.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,12 +2,13 @@ package org.hibernate.test.annotations.idmanytoone; import java.io.Serializable; + +import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.Table; import javax.persistence.IdClass; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; -import javax.persistence.Entity; +import javax.persistence.Table; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomerPK.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomerPK.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/StoreCustomerPK.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,9 +2,10 @@ package org.hibernate.test.annotations.idmanytoone; import java.io.Serializable; + +import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; -import javax.persistence.Id; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/A.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/A.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/A.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.idmanytoone.alphabetical; import java.util.List; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToMany; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/Acces.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.io.Serializable; import java.math.BigInteger; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToOne; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/BId.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/BId.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/BId.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.idmanytoone.alphabetical; import java.io.Serializable; + import javax.persistence.Embeddable; import javax.persistence.JoinColumn; import javax.persistence.JoinColumns; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/C.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/C.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/C.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.idmanytoone.alphabetical; import java.util.List; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.IdClass; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/CId.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/CId.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/CId.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.idmanytoone.alphabetical; import java.io.Serializable; + import javax.persistence.Embeddable; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -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,7 @@ 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; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/AddressBook.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,13 +3,13 @@ import java.util.HashMap; import java.util.Map; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.MapKey; import javax.persistence.OneToMany; -import javax.persistence.JoinTable; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/AddressEntryPk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.indexcoll; import java.io.Serializable; + import javax.persistence.Embeddable; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,17 +3,18 @@ import java.util.HashMap; import java.util.Map; + import javax.persistence.CascadeType; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; import javax.persistence.ManyToMany; -import javax.persistence.Column; -import javax.persistence.JoinTable; -import javax.persistence.JoinColumn; +import org.hibernate.annotations.CollectionOfElements; import org.hibernate.annotations.MapKey; -import org.hibernate.annotations.CollectionOfElements; import org.hibernate.annotations.MapKeyManyToMany; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Drawer.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.indexcoll; import java.util.List; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationGroup.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,8 @@ package org.hibernate.test.annotations.indexcoll; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/GenerationUser.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,13 +1,14 @@ //$Id$ package org.hibernate.test.annotations.indexcoll; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; -import javax.persistence.OneToMany; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.Entity; import javax.persistence.MapKey; -import javax.persistence.GeneratedValue; +import javax.persistence.OneToMany; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -6,9 +6,9 @@ import java.util.List; import java.util.Map; +import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.Hibernate; import org.hibernate.dialect.HSQLDialect; import org.hibernate.test.annotations.RequiresDialect; import org.hibernate.test.annotations.TestCase; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,9 @@ //$Id$ package org.hibernate.test.annotations.indexcoll; -import org.hibernate.test.annotations.TestCase; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.test.annotations.TestCase; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Newspaper.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.util.HashMap; import java.util.Map; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Painter.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.util.HashMap; import java.util.Map; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/PaintingPk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.indexcoll; import java.io.Serializable; + import javax.persistence.Embeddable; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/PressReleaseAgency.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.util.HashMap; import java.util.Map; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Software.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,9 @@ //$Id$ package org.hibernate.test.annotations.indexcoll; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.MapKey; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Trainee.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,8 @@ package org.hibernate.test.annotations.indexcoll; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Training.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,11 +3,12 @@ import java.util.SortedMap; import java.util.TreeMap; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import javax.persistence.ManyToMany; import javax.persistence.MapKey; -import javax.persistence.ManyToMany; import org.hibernate.annotations.Sort; import org.hibernate.annotations.SortType; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Version.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,12 +1,12 @@ //$Id$ package org.hibernate.test.annotations.indexcoll; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Table; -import javax.persistence.Column; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/Wardrobe.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.indexcoll; import java.util.List; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/Tomato.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/Tomato.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/Tomato.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,10 @@ //$Id$ package org.hibernate.test.annotations.inheritance; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; -import javax.persistence.Column; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/VegetablePk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/VegetablePk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/VegetablePk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.inheritance; import java.io.Serializable; + import javax.persistence.Embeddable; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Asset.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -4,11 +4,11 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Clothing.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Clothing.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Clothing.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,12 +1,12 @@ //$Id$ package org.hibernate.test.annotations.inheritance.joined; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; -import javax.persistence.Column; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/File.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/File.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/File.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,12 +1,12 @@ //$Id$ package org.hibernate.test.annotations.inheritance.joined; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.ManyToOne; -import javax.persistence.Column; import javax.persistence.Table; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Folder.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Folder.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Folder.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.util.HashSet; import java.util.Set; + import javax.persistence.Entity; import javax.persistence.OneToMany; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Parent.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Parent.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Parent.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.util.HashSet; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Pool.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Pool.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/Pool.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,13 +1,13 @@ //$Id$ package org.hibernate.test.annotations.inheritance.joined; +import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.SecondaryTable; -import javax.persistence.Column; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; +import javax.persistence.SecondaryTable; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Folder.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Folder.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/mixed/Folder.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.util.HashSet; import java.util.Set; + import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; import javax.persistence.OneToMany; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/singletable/Music.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,9 +2,9 @@ package org.hibernate.test.annotations.inheritance.singletable; import javax.persistence.Column; -import javax.persistence.Entity; import javax.persistence.DiscriminatorColumn; import javax.persistence.DiscriminatorType; +import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Table; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/union/Folder.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/union/Folder.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/union/Folder.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.util.HashSet; import java.util.Set; + import javax.persistence.Entity; import javax.persistence.OneToMany; import javax.persistence.Table; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/interfaces/UserImpl.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/interfaces/UserImpl.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/interfaces/UserImpl.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.interfaces; import java.util.Collection; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/A.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/A.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/A.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ package org.hibernate.test.annotations.join; import java.util.Date; + +import javax.persistence.Column; import javax.persistence.MappedSuperclass; -import javax.persistence.Column; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/B.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/B.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/B.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,8 +3,8 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/C.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/C.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/C.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,8 @@ package org.hibernate.test.annotations.join; import javax.persistence.Column; +import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; -import javax.persistence.DiscriminatorValue; import javax.persistence.SecondaryTable; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Cat.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Cat.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Cat.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.join; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -10,12 +11,12 @@ import javax.persistence.SecondaryTables; import javax.persistence.UniqueConstraint; +import org.hibernate.annotations.FetchMode; +import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Index; +import org.hibernate.annotations.SQLInsert; import org.hibernate.annotations.Table; -import org.hibernate.annotations.ForeignKey; import org.hibernate.annotations.Tables; -import org.hibernate.annotations.FetchMode; -import org.hibernate.annotations.SQLInsert; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Death.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Death.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Death.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,13 +3,14 @@ import java.io.Serializable; import java.util.Date; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.SecondaryTable; -import javax.persistence.PrimaryKeyJoinColumn; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/DogPk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/DogPk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/DogPk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.join; import java.io.Serializable; + import javax.persistence.Embeddable; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Life.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Life.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/Life.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.join; import java.io.Serializable; + import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ //$Id$ package org.hibernate.test.annotations.loader; +import java.util.Iterator; import java.util.Set; -import java.util.Iterator; import org.hibernate.Session; import org.hibernate.Transaction; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/Team.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/Team.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/Team.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -12,11 +12,7 @@ import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.Loader; -import org.hibernate.annotations.NamedNativeQueries; -import org.hibernate.annotations.NamedNativeQuery; -import javax.persistence.NamedQuery; - @Entity public class Team { private Long id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,9 +2,10 @@ package org.hibernate.test.annotations.manytomany; import java.util.Date; + import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Cat.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,15 +2,13 @@ package org.hibernate.test.annotations.manytomany; import java.util.Set; + import javax.persistence.EmbeddedId; import javax.persistence.Entity; +import javax.persistence.JoinTable; import javax.persistence.ManyToMany; import javax.persistence.Table; -import javax.persistence.JoinTable; -import javax.persistence.JoinColumn; -import org.hibernate.annotations.Index; - /** * @author Emmanuel Bernard */ Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/CatPk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/CatPk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/CatPk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.manytomany; import java.io.Serializable; + import javax.persistence.Column; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Company.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Company.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Company.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ package org.hibernate.test.annotations.manytomany; import java.io.Serializable; + +import javax.persistence.Column; import javax.persistence.MappedSuperclass; -import javax.persistence.Column; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Employee.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,14 +3,15 @@ import java.io.Serializable; import java.util.Collection; + import javax.persistence.CascadeType; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.ManyToMany; -import javax.persistence.Column; import org.hibernate.annotations.Cascade; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Friend.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Friend.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Friend.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.io.Serializable; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Group.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Group.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Group.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.manytomany; import java.util.Collection; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.Id; @@ -9,10 +10,10 @@ import javax.persistence.OrderBy; import javax.persistence.Table; -import org.hibernate.annotations.Where; +import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; -import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterJoinTable; +import org.hibernate.annotations.Where; import org.hibernate.annotations.WhereJoinTable; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,23 +1,19 @@ //$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; import org.hibernate.annotations.Filter; +import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.FilterJoinTable; +import org.hibernate.annotations.Where; import org.hibernate.annotations.WhereJoinTable; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Inspector.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Inspector.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Inspector.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.manytomany; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/InspectorPrefixes.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/InspectorPrefixes.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/InspectorPrefixes.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.JoinColumn; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/KnownClient.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/KnownClient.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/KnownClient.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.manytomany; import java.util.Set; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Man.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Man.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Man.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.io.Serializable; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/ManPk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/ManPk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/ManPk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ package org.hibernate.test.annotations.manytomany; import java.io.Serializable; + +import javax.persistence.Column; import javax.persistence.Embeddable; -import javax.persistence.Column; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Permission.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Permission.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Permission.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.manytomany; import java.util.Date; + import javax.persistence.Entity; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Store.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Store.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Store.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.manytomany; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Supplier.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Supplier.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Supplier.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.manytomany; import java.util.Set; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Woman.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Woman.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/Woman.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.io.Serializable; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/WomanPk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/WomanPk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/WomanPk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,9 @@ package org.hibernate.test.annotations.manytomany; import java.io.Serializable; + +import javax.persistence.Column; import javax.persistence.Embeddable; -import javax.persistence.Column; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/BiggestForest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/BiggestForest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/BiggestForest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,9 +2,9 @@ package org.hibernate.test.annotations.manytoone; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; import javax.persistence.OneToOne; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Carz.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Carz.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Carz.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,15 +3,15 @@ import java.io.Serializable; import java.util.Date; + +import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Column; -import javax.persistence.JoinColumns; import javax.persistence.FetchType; +import javax.persistence.Id; import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Temporal; import javax.persistence.TemporalType; -import javax.persistence.Id; -import javax.persistence.Temporal; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Child.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Child.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Child.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.manytoone; import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Customer.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Customer.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Customer.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.manytoone; import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Deal.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Deal.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Deal.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,10 +2,10 @@ package org.hibernate.test.annotations.manytoone; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; +import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; -import javax.persistence.JoinColumn; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/DistrictUser.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/DistrictUser.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/DistrictUser.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,6 +1,7 @@ package org.hibernate.test.annotations.manytoone; import java.util.Date; + import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ForestType.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ForestType.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ForestType.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,13 +2,14 @@ package org.hibernate.test.annotations.manytoone; import java.util.Set; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; import javax.persistence.OneToMany; import javax.persistence.OneToOne; -import javax.persistence.JoinTable; -import javax.persistence.JoinColumn; import org.hibernate.annotations.ForeignKey; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Frame.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,9 @@ //$Id$ package org.hibernate.test.annotations.manytoone; +import java.io.Serializable; import java.util.Set; -import java.io.Serializable; -import javax.persistence.Column; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Lens.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Lens.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Lens.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,10 +2,10 @@ package org.hibernate.test.annotations.manytoone; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; -import javax.persistence.JoinColumn; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; import org.hibernate.annotations.Formula; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Lotz.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Lotz.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Lotz.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,14 +1,15 @@ //$Id$ package org.hibernate.test.annotations.manytoone; +import java.io.Serializable; import java.util.List; -import java.io.Serializable; + +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.EmbeddedId; import javax.persistence.Entity; -import javax.persistence.EmbeddedId; -import javax.persistence.Column; import javax.persistence.FetchType; import javax.persistence.OneToMany; -import javax.persistence.CascadeType; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/LotzPK.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/LotzPK.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/LotzPK.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.manytoone; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Embeddable; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,9 @@ //$Id$ package org.hibernate.test.annotations.manytoone; -import org.hibernate.test.annotations.TestCase; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.test.annotations.TestCase; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,7 @@ //$Id$ package org.hibernate.test.annotations.manytoone; -import java.util.Date; - import org.hibernate.test.annotations.TestCase; -import org.hibernate.Session; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Node.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Node.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Node.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.manytoone; import java.io.Serializable; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/NodePk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/NodePk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/NodePk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.manytoone; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Embeddable; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Order.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Order.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Order.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,12 +3,13 @@ import java.io.Serializable; import java.util.Set; + +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.Column; +import javax.persistence.OneToMany; import javax.persistence.Table; -import javax.persistence.OneToMany; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/OrderLine.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/OrderLine.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/OrderLine.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,10 +2,10 @@ package org.hibernate.test.annotations.manytoone; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; +import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; -import javax.persistence.JoinColumn; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Parent.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Parent.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/Parent.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.manytoone; import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ParentPk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ParentPk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ParentPk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.manytoone; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Embeddable; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/TreeType.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/TreeType.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/TreeType.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,12 +2,12 @@ package org.hibernate.test.annotations.manytoone; import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.JoinTable; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.JoinColumn; -import javax.persistence.FetchType; +import javax.persistence.JoinTable; +import javax.persistence.ManyToOne; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/User.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/User.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/User.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ import java.util.Date; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/UserPK.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/UserPK.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/UserPK.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.Date; + import javax.persistence.Column; public class UserPK implements Serializable { Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/GenericObject.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/GenericObject.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/GenericObject.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.io.Serializable; import java.rmi.server.UID; + import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Item.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Item.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Item.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,11 +1,7 @@ //$ package org.hibernate.test.annotations.manytoone.referencedcolumnname; -import java.util.HashSet; -import java.util.Set; import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.Transient; @Entity Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,8 +3,8 @@ import java.math.BigDecimal; +import org.hibernate.Session; import org.hibernate.test.annotations.TestCase; -import org.hibernate.Session; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Vendor.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Vendor.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/Vendor.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,11 +1,7 @@ //$ package org.hibernate.test.annotations.manytoone.referencedcolumnname; -import java.util.HashSet; -import java.util.Set; import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.Transient; @Entity public class Vendor extends GenericObject { Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/WarehouseItem.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.manytoone.referencedcolumnname; import java.math.BigDecimal; + import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.JoinColumn; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ZItemCost.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ZItemCost.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ZItemCost.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,11 +2,10 @@ package org.hibernate.test.annotations.manytoone.referencedcolumnname; import java.math.BigDecimal; + import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.ManyToOne; -import javax.persistence.Transient; -import javax.persistence.JoinColumn; @Entity public class ZItemCost extends GenericObject { Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/State.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/State.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/State.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,9 @@ //$Id$ package org.hibernate.test.annotations.naturalid; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; -import javax.persistence.Entity; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/notfound/Currency.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/notfound/Currency.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/notfound/Currency.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.notfound; import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Child.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Child.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Child.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.onetomany; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/City.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/City.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/City.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Order.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Order.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Order.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,9 @@ //$Id$ package org.hibernate.test.annotations.onetomany; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.List; import java.util.ArrayList; +import java.util.List; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.IdClass; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ //$Id$ package org.hibernate.test.annotations.onetomany; +import org.hibernate.Session; import org.hibernate.test.annotations.TestCase; -import org.hibernate.Session; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderID.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.onetomany; import java.io.Serializable; + import javax.persistence.Column; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderItemID.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.onetomany; import java.io.Serializable; + import javax.persistence.Column; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Organisation.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,14 +3,15 @@ import java.io.Serializable; import java.util.Set; + +import javax.persistence.CascadeType; +import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Column; +import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.OrderBy; -import javax.persistence.CascadeType; -import javax.persistence.FetchType; +import javax.persistence.Table; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrganisationUser.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.onetomany; import java.io.Serializable; + import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Parent.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/ParentPk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.onetomany; import java.io.Serializable; + import javax.persistence.Embeddable; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Person.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Person.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Person.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,12 +2,13 @@ package org.hibernate.test.annotations.onetomany; import java.io.Serializable; + import javax.persistence.Column; +import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; -import javax.persistence.InheritanceType; -import javax.persistence.Inheritance; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/PoliticalParty.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.util.HashSet; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Street.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Street.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Street.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,11 +1,11 @@ //$Id$ package org.hibernate.test.annotations.onetomany; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.ManyToOne; -import javax.persistence.Column; import org.hibernate.annotations.Formula; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Trainer.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.onetomany; import java.util.Set; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/Troop.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.util.HashSet; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.onetoone; import java.io.Serializable; + import javax.persistence.Embeddable; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,11 +1,10 @@ //$Id$ package org.hibernate.test.annotations.onetoone; +import org.hibernate.AnnotationException; +import org.hibernate.SessionFactory; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Environment; -import org.hibernate.test.annotations.IncorrectEntity; -import org.hibernate.SessionFactory; -import org.hibernate.AnnotationException; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,12 +1,12 @@ //$Id$ package org.hibernate.test.annotations.onetoone; +import javax.persistence.CascadeType; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.OneToOne; import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.CascadeType; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,8 @@ package org.hibernate.test.annotations.onetoone; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.OneToOne; import org.hibernate.annotations.GenericGenerator; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -4,7 +4,6 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.onetoone; import java.io.Serializable; + import javax.persistence.Embeddable; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/Hardware.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -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.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) Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/Card.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/Card.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/Card.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,6 +1,7 @@ package org.hibernate.test.annotations.persister; import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.JoinColumn; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/Deck.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/Deck.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/Deck.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ import java.io.Serializable; import java.util.Set; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToMany; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/EntityPersister.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,7 +1,6 @@ package org.hibernate.test.annotations.persister; import org.hibernate.HibernateException; -import org.hibernate.cache.CacheConcurrencyStrategy; import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,9 @@ //$Id$ package org.hibernate.test.annotations.polymorphism; -import org.hibernate.test.annotations.TestCase; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.test.annotations.TestCase; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Captain.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Captain.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Captain.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.query; import java.io.Serializable; + import javax.persistence.ColumnResult; import javax.persistence.Entity; import javax.persistence.EntityResult; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/CasimirParticle.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,8 @@ package org.hibernate.test.annotations.query; import javax.persistence.Entity; +import javax.persistence.Id; import javax.persistence.Table; -import javax.persistence.Id; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Chaos.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Chaos.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Chaos.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,22 +1,22 @@ //$Id$ package org.hibernate.test.annotations.query; +import java.util.HashSet; import java.util.Set; -import java.util.HashSet; + +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.NamedQuery; +import javax.persistence.JoinColumn; import javax.persistence.NamedNativeQuery; import javax.persistence.OneToMany; -import javax.persistence.JoinColumn; -import javax.persistence.Column; +import javax.persistence.Table; +import org.hibernate.annotations.Loader; +import org.hibernate.annotations.SQLDelete; +import org.hibernate.annotations.SQLDeleteAll; import org.hibernate.annotations.SQLInsert; import org.hibernate.annotations.SQLUpdate; -import org.hibernate.annotations.SQLDelete; -import org.hibernate.annotations.SQLDeleteAll; -import org.hibernate.annotations.Loader; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Night.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Night.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/Night.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.query; import java.util.Date; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,9 @@ //$Id$ package org.hibernate.test.annotations.quote; -import org.hibernate.test.annotations.TestCase; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.test.annotations.TestCase; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/Role.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/Role.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/Role.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,10 +2,11 @@ package org.hibernate.test.annotations.quote; import java.io.Serializable; -import javax.persistence.Id; + import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; -import javax.persistence.GeneratedValue; +import javax.persistence.Id; import javax.persistence.Table; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/User.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/User.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/User.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,14 +2,15 @@ package org.hibernate.test.annotations.quote; import java.io.Serializable; +import java.util.HashSet; import java.util.Set; -import java.util.HashSet; -import javax.persistence.ManyToMany; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; -import javax.persistence.Table; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.ManyToMany; +import javax.persistence.Table; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/House.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Inhabitant.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ItemCost.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,11 @@ //$Id$ package org.hibernate.test.annotations.referencedcolumnname; +import java.io.Serializable; import java.math.BigDecimal; -import java.io.Serializable; + +import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.Entity; import javax.persistence.ManyToOne; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Luggage.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Postman.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.referencedcolumnname; import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Rambler.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ //$Id$ package org.hibernate.test.annotations.referencedcolumnname; +import java.math.BigDecimal; import java.util.Iterator; -import java.math.BigDecimal; import org.hibernate.Session; import org.hibernate.Transaction; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/Vendor.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ //$Id$ package org.hibernate.test.annotations.referencedcolumnname; +import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.Entity; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/WarehouseItem.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,11 +2,12 @@ package org.hibernate.test.annotations.referencedcolumnname; import java.math.BigDecimal; + import javax.persistence.Entity; import javax.persistence.Id; +import javax.persistence.JoinColumn; import javax.persistence.JoinColumns; import javax.persistence.ManyToOne; -import javax.persistence.JoinColumn; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; import java.util.Map; + import javax.persistence.EmbeddedId; import javax.persistence.Entity; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/EJB3OverridenAnnotationReaderTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/EJB3OverridenAnnotationReaderTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/EJB3OverridenAnnotationReaderTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -8,6 +8,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; + import javax.persistence.AssociationOverrides; import javax.persistence.AttributeOverrides; import javax.persistence.Basic; @@ -17,6 +18,7 @@ import javax.persistence.Embedded; import javax.persistence.EmbeddedId; import javax.persistence.Entity; +import javax.persistence.EntityListeners; import javax.persistence.EnumType; import javax.persistence.Enumerated; import javax.persistence.ExcludeDefaultListeners; @@ -39,6 +41,9 @@ import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.OrderBy; +import javax.persistence.PostLoad; +import javax.persistence.PostPersist; +import javax.persistence.PrePersist; import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.PrimaryKeyJoinColumns; import javax.persistence.SecondaryTable; @@ -51,12 +56,9 @@ import javax.persistence.TemporalType; import javax.persistence.Transient; import javax.persistence.Version; -import javax.persistence.PrePersist; -import javax.persistence.EntityListeners; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; import junit.framework.TestCase; + import org.dom4j.DocumentException; import org.dom4j.io.SAXReader; import org.hibernate.annotations.Columns; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ //$Id$ package org.hibernate.test.annotations.reflection; +import javax.persistence.PostPersist; import javax.persistence.PrePersist; -import javax.persistence.PostPersist; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ //$Id$ package org.hibernate.test.annotations.reflection; +import javax.persistence.PostPersist; import javax.persistence.PrePersist; -import javax.persistence.PostPersist; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.reflection; import java.io.Serializable; + import javax.persistence.Embeddable; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -8,6 +8,7 @@ import java.util.List; import junit.framework.TestCase; + import org.dom4j.io.SAXReader; import org.hibernate.cfg.EJB3DTDEntityResolver; import org.hibernate.cfg.annotations.reflection.XMLContext; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/strategy/Storm.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/strategy/Storm.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/strategy/Storm.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -6,8 +6,8 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import javax.persistence.Table; import javax.persistence.UniqueConstraint; -import javax.persistence.Table; import org.hibernate.annotations.Index; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,12 +2,11 @@ package org.hibernate.test.annotations.tableperclass; import java.util.List; -import java.sql.SQLException; +import org.hibernate.JDBCException; import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.JDBCException; import org.hibernate.test.annotations.TestCase; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/Brand.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/Brand.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/Brand.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,15 +1,16 @@ //$Id$ package org.hibernate.test.annotations.target; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; + import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.ManyToMany; +import org.hibernate.annotations.CollectionOfElements; import org.hibernate.annotations.MapKey; -import org.hibernate.annotations.CollectionOfElements; import org.hibernate.annotations.MapKeyManyToMany; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/LuggageImpl.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,11 +1,10 @@ //$Id$ package org.hibernate.test.annotations.target; +import javax.persistence.Embedded; import javax.persistence.Entity; -import javax.persistence.Id; import javax.persistence.GeneratedValue; -import javax.persistence.ManyToOne; -import javax.persistence.Embedded; +import javax.persistence.Id; import org.hibernate.annotations.Target; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/Owner.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/Owner.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/Owner.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,7 +1,6 @@ //$Id$ package org.hibernate.test.annotations.target; -import java.util.Map; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/OwnerImpl.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,11 +1,7 @@ //$Id$ package org.hibernate.test.annotations.target; -import java.util.Map; -import java.util.HashMap; import javax.persistence.Embeddable; -import org.hibernate.annotations.MapKey; -import javax.persistence.ManyToMany; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/TargetTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/TargetTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/TargetTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ //$Id$ package org.hibernate.test.annotations.target; +import org.hibernate.Session; import org.hibernate.test.annotations.TestCase; -import org.hibernate.Session; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/Country.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/Country.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/Country.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ //$Id$ package org.hibernate.test.annotations.tuplizer; +import javax.persistence.Column; import javax.persistence.Embeddable; -import javax.persistence.Column; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/Cuisine.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/Cuisine.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/Cuisine.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,9 @@ //$Id$ package org.hibernate.test.annotations.tuplizer; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; -import javax.persistence.Entity; import org.hibernate.annotations.Tuplizer; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DataProxyHandler.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DataProxyHandler.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DataProxyHandler.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,10 @@ //$Id$ package org.hibernate.test.annotations.tuplizer; +import java.io.Serializable; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.util.HashMap; -import java.io.Serializable; /** * A simple {@link java.lang.reflect.InvocationHandler} to act as the handler for our generated Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicComponentTuplizer.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicComponentTuplizer.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicComponentTuplizer.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,16 +1,9 @@ //$Id$ package org.hibernate.test.annotations.tuplizer; -import org.hibernate.tuple.entity.PojoEntityTuplizer; -import org.hibernate.tuple.entity.EntityMetamodel; +import org.hibernate.mapping.Component; import org.hibernate.tuple.Instantiator; import org.hibernate.tuple.component.PojoComponentTuplizer; -import org.hibernate.mapping.PersistentClass; -import org.hibernate.mapping.Component; -import org.hibernate.proxy.ProxyFactory; -import org.hibernate.property.Getter; -import org.hibernate.property.Setter; -import org.hibernate.HibernateException; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicEntityTuplizer.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicEntityTuplizer.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicEntityTuplizer.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,13 +1,13 @@ //$Id$ package org.hibernate.test.annotations.tuplizer; -import org.hibernate.tuple.entity.PojoEntityTuplizer; -import org.hibernate.tuple.entity.EntityMetamodel; -import org.hibernate.tuple.Instantiator; import org.hibernate.mapping.PersistentClass; -import org.hibernate.proxy.ProxyFactory; import org.hibernate.property.Getter; import org.hibernate.property.Setter; +import org.hibernate.proxy.ProxyFactory; +import org.hibernate.tuple.Instantiator; +import org.hibernate.tuple.entity.EntityMetamodel; +import org.hibernate.tuple.entity.PojoEntityTuplizer; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicInstantiator.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicInstantiator.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/DynamicInstantiator.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,12 +2,12 @@ package org.hibernate.test.annotations.tuplizer; import java.io.Serializable; +import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; -import java.lang.reflect.InvocationHandler; +import org.hibernate.HibernateException; import org.hibernate.tuple.Instantiator; import org.hibernate.util.ReflectHelper; -import org.hibernate.HibernateException; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/ProxyHelper.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/ProxyHelper.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/ProxyHelper.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,8 +2,8 @@ package org.hibernate.test.annotations.tuplizer; import java.io.Serializable; +import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; -import java.lang.reflect.InvocationHandler; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,8 +1,8 @@ //$Id$ package org.hibernate.test.annotations.tuplizer; +import org.hibernate.Session; import org.hibernate.test.annotations.TestCase; -import org.hibernate.Session; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/Antenna.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/Antenna.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/Antenna.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,9 @@ //$Id$ package org.hibernate.test.annotations.various; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.Column; import org.hibernate.annotations.Generated; import org.hibernate.annotations.GenerationTime; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,9 +1,9 @@ //$Id$ package org.hibernate.test.annotations.various; -import org.hibernate.test.annotations.TestCase; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.test.annotations.TestCase; /** * @author Emmanuel Bernard Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/ProfessionalAgreement.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.various; import java.util.Date; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,10 +3,11 @@ import java.util.HashSet; import java.util.Set; + import javax.persistence.Entity; import javax.persistence.Id; +import javax.persistence.NamedQuery; import javax.persistence.OneToMany; -import javax.persistence.NamedQuery; import javax.persistence.TableGenerator; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/AImpl.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,11 +3,11 @@ import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.Table; -import javax.persistence.GeneratedValue; @Entity @Inheritance( strategy = InheritanceType.JOINED ) Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -4,7 +4,6 @@ import java.util.HashSet; import org.hibernate.Session; -import org.hibernate.cfg.Configuration; import org.hibernate.test.annotations.TestCase; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -1,10 +1,7 @@ //$Id:HbmTest.java 9793 2006-04-26 02:20:18 -0400 (mer., 26 avr. 2006) epbernard $ package org.hibernate.test.annotations.xml.hbm; -import java.util.HashSet; - import org.hibernate.Session; -import org.hibernate.cfg.Configuration; import org.hibernate.test.annotations.TestCase; /** Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/PrimeMinister.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.xml.hbm; import java.util.Set; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/Sky.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -3,6 +3,7 @@ import java.util.HashSet; import java.util.Set; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java 2010-03-23 20:59:05 UTC (rev 19091) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/ZImpl.java 2010-03-23 21:14:04 UTC (rev 19092) @@ -4,13 +4,13 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; -import javax.persistence.GeneratedValue; @Entity @Inheritance( strategy = InheritanceType.JOINED )