[hibernate-commits] Hibernate SVN: r10566 - in
branches/Lucene_Integration/HibernateExt: . ejb ejb/doc/reference/en
ejb/doc/reference/en/modules ejb/lib ejb/src/java/org/hibernate/ejb
ejb/src/java/org/hibernate/ejb/connection
ejb/src/java/org/hibernate/ejb/event
ejb/src/java/org/hibernate/ejb/instrument
ejb/src/java/org/hibernate/ejb/packaging
ejb/src/java/org/hibernate/ejb/util ejb/src/test
ejb/src/test/org/hibernate/ejb/test
ejb/src/test/org/hibernate/ejb/test/association
ejb/src/test/org/hibernate/ejb/test/cascade
ejb/src/test/org/hibernate/ejb/test/emops
ejb/src/test/org/hibernate/ejb/test/exception
ejb/src/test/org/hibernate/ejb/test/inheritance
ejb/src/test/org/hibernate/ejb/test/pack
ejb/src/test/org/hibernate/ejb/test/pack/explicitpar
ejb/src/test/org/hibernate/ejb/test/packaging
ejb/src/test/org/hibernate/ejb/test/transaction
ejb/src/test/org/hibernate/ejb/test/xml
ejb/src/test-resources/explicitpar/META-INF ejb-api ejb-api/etc
ejb-api/src/javax/persistence ejb-api/src/javax/!
persistence/spi metadata metadata/doc/reference/en
metadata/doc/reference/en/modules metadata/lib
metadata/src/java/org/hibernate/annotationfactory
metadata/src/java/org/hibernate/annotations
metadata/src/java/org/hibernate/cfg
metadata/src/java/org/hibernate/cfg/annotations
metadata/src/java/org/hibernate/lucene/event
metadata/src/java/org/hibernate/lucene/store
metadata/src/java/org/hibernate/reflection/java
metadata/src/java/org/hibernate/reflection/java/generics
metadata/src/java/org/hibernate/reflection/java/xml
metadata/src/java/org/hibernate/type
metadata/src/java/org/hibernate/validator
metadata/src/java/org/hibernate/validator/event
metadata/src/java/org/hibernate/validator/interpolator metadata/src/test
metadata/src/test/org/hibernate/lucene/test
metadata/src/test/org/hibernate/test/annotations
metadata/src/test/org/hibernate/test/annotations/bytecode
metadata/src/test/org/hibernate/test/annotations/collectionelement
metadata/src/test/org/hibernate/test/annotation!
s/duplicatedgenerator
metadata/src/test/org/hibernate/test/annotations/entity
metadata/src/test/org/hibernate/test/annotations/generics
metadata/src/test/org/hibernate/test/annotations/genericsinheritance
metadata/src/test/org/hibernate/test/annotations/id
metadata/src/test/org/hibernate/test/annotations/identifiercollection
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Wed Oct 11 00:03:47 EDT 2006
Author: epbernard
Date: 2006-10-11 00:01:11 -0400 (Wed, 11 Oct 2006)
New Revision: 10566
Added:
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/PersistenceProperty.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/package-info.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/spi/package-info.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/util/NamingHelper.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/NoPackageEntity.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/AssociationTest.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/Incident.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/IncidentStatus.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/Kitchen.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/Oven.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/Author.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/CascadeTest.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/FetchTest2.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/Soldier2.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/Song.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/Student.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/Teacher.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/Troop2.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/emops/Mail.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/inheritance/
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/inheritance/Fruit.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/inheritance/InheritanceTest.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/inheritance/Strawberry.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/pack/explicitpar/
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/pack/explicitpar/Washer.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/xml/Article.java
branches/Lucene_Integration/HibernateExt/metadata/lucene.txt
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/annotations/CollectionId.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/annotations/FilterJoinTable.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/annotations/FilterJoinTables.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/annotations/ForceDiscriminator.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/annotations/ForeignKey.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/annotations/WhereJoinTable.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/IdBagBinder.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/validator/Environment.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/validator/MessageInterpolator.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/validator/interpolator/
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/validator/interpolator/DefaultMessageInterpolator.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/validator/interpolator/DefaultMessageInterpolatorAggerator.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/Clock.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/Hammer.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/Tool.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/hammer.hbm.xml
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/orm.xml
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/generics/State.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/generics/StateType.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/Child.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy1.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy2.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy22.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/Parent.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy1.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy2.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy22.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/identifiercollection/
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/identifiercollection/Passport.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/identifiercollection/Stamp.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/idmanytoone/
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/idmanytoone/Card.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/idmanytoone/CardField.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/idmanytoone/CardKey.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/idmanytoone/IdManyToOne.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/idmanytoone/Project.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/indexcoll/Trainee.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/indexcoll/Training.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/Asset.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/FinancialAsset.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/Parent.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/Pool.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/PropertyAsset.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/SwimmingPool.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/manytomany/Building.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/manytomany/BuildingCompany.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/manytomany/Company.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/onetoone/Incident.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/onetoone/IncidentStatus.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/orm.xml
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/query/orm.xml
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/DeepGenericsInheritance.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/Dummy.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/DummySubclass.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/GenericSuperclass1.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/GenericSuperclass2.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/Subclass1.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/Subclass2.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/Organization.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/validator/test/PrefixMessageInterpolator.java
branches/Lucene_Integration/HibernateExt/tools/lib/jtidy-r8-20060801.jar
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/MetaAttributeBinder.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/AbstractMetaDataDialect.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/OracleMetaDataDialect.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/Version.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/ant/JPAConfigurationTask.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/DAONewExporter.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/visitor/EntityNameFromValueVisitor.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/visitor/JavaTypeFromValueVisitor.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/stat/
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/stat/AbstractTreeModel.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/stat/BeanTableModel.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/stat/StatisticsBrowser.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/stat/StatisticsCellRenderer.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/stat/StatisticsTreeModel.java
branches/Lucene_Integration/HibernateExt/tools/src/templates/dot/
branches/Lucene_Integration/HibernateExt/tools/src/templates/dot/entitygraph.dot.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/dot/tablegraph.dot.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/hbm/meta.hbm.ftl
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/UnionSubclass.hbm.xml
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Aliens.hbm.xml
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/stat/
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/stat/Group.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/stat/SessionAttribute.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/stat/StatisticsBrowserTest.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/stat/User.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/stat/UserGroup.hbm.xml
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/ManyToManyTest.java
Removed:
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/FlushMode.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/AssociationTest.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/Incident.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/IncidentStatus.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/Kitchen.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/association/Oven.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/inheritance/Fruit.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/inheritance/InheritanceTest.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/inheritance/Strawberry.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/pack/explicitpar/Washer.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/validator/interpolator/DefaultMessageInterpolator.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/validator/interpolator/DefaultMessageInterpolatorAggerator.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/PackageLevelTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/Hammer.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/Tool.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/bytecode/hammer.hbm.xml
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/package-info.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/Child.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy1.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy2.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/ChildHierarchy22.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/Parent.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy1.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy2.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/genericsinheritance/ParentHierarchy22.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/identifiercollection/Passport.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/identifiercollection/Stamp.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/idmanytoone/Card.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/idmanytoone/CardField.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/idmanytoone/CardKey.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/idmanytoone/IdManyToOne.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/idmanytoone/Project.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/package-info.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/query/package-info.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/DeepGenericsInheritance.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/Dummy.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/DummySubclass.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/GenericSuperclass1.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/GenericSuperclass2.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/Subclass1.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/generics/deep/Subclass2.java
branches/Lucene_Integration/HibernateExt/tools/lib/jtidy-r8-21122004.jar
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/ant/EJB3ConfigurationTask.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Version.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/stat/AbstractTreeModel.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/stat/BeanTableModel.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/stat/StatisticsBrowser.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/stat/StatisticsCellRenderer.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/stat/StatisticsTreeModel.java
branches/Lucene_Integration/HibernateExt/tools/src/templates/dot/entitygraph.dot.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/dot/tablegraph.dot.ftl
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/stat/Group.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/stat/SessionAttribute.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/stat/StatisticsBrowserTest.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/stat/User.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/stat/UserGroup.hbm.xml
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/newformat.reveng.xml
branches/Lucene_Integration/HibernateExt/tools/src/testsupport/generictemplates/pojo/generic-class.vm
branches/Lucene_Integration/HibernateExt/tools/src/testsupport/generictemplates/pojo/generic-content.vm
branches/Lucene_Integration/HibernateExt/tools/src/testsupport/generictemplates/pojo/generic-test.vm
branches/Lucene_Integration/HibernateExt/tools/src/testsupport/templates/pojo/Pojo.vm
Modified:
branches/Lucene_Integration/HibernateExt/build.bat
branches/Lucene_Integration/HibernateExt/ejb-api/build.xml
branches/Lucene_Integration/HibernateExt/ejb-api/etc/license.txt
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/AssociationOverride.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/AssociationOverrides.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/AttributeOverride.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/AttributeOverrides.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/Basic.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/CascadeType.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/Column.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/ColumnResult.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/DiscriminatorColumn.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/DiscriminatorType.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/DiscriminatorValue.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/Embeddable.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/Embedded.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/EmbeddedId.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/Entity.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/EntityExistsException.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/EntityListeners.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/EntityManager.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/EntityManagerFactory.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/EntityNotFoundException.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/EntityResult.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/EntityTransaction.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/EnumType.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/Enumerated.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/ExcludeDefaultListeners.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/ExcludeSuperclassListeners.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/FetchType.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/FieldResult.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/FlushModeType.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/GeneratedValue.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/GenerationType.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/Id.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/IdClass.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/Inheritance.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/InheritanceType.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/JoinColumn.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/JoinColumns.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/JoinTable.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/Lob.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/LockModeType.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/ManyToMany.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/ManyToOne.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/MapKey.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/MappedSuperclass.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/NamedNativeQueries.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/NamedNativeQuery.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/NamedQueries.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/NamedQuery.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/NoResultException.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/NonUniqueResultException.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/OneToMany.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/OneToOne.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/OptimisticLockException.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/OrderBy.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/Persistence.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/PersistenceContext.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/PersistenceContextType.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/PersistenceContexts.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/PersistenceException.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/PersistenceUnit.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/PersistenceUnits.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/PostLoad.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/PostPersist.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/PostRemove.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/PostUpdate.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/PrePersist.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/PreRemove.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/PreUpdate.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/PrimaryKeyJoinColumn.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/PrimaryKeyJoinColumns.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/Query.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/QueryHint.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/RollbackException.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/SecondaryTable.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/SecondaryTables.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/SequenceGenerator.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMapping.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/SqlResultSetMappings.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/Table.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/TableGenerator.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/Temporal.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/TemporalType.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/TransactionRequiredException.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/Transient.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/UniqueConstraint.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/Version.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/spi/ClassTransformer.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/spi/PersistenceProvider.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/spi/PersistenceUnitInfo.java
branches/Lucene_Integration/HibernateExt/ejb-api/src/javax/persistence/spi/PersistenceUnitTransactionType.java
branches/Lucene_Integration/HibernateExt/ejb/build.xml
branches/Lucene_Integration/HibernateExt/ejb/changelog.txt
branches/Lucene_Integration/HibernateExt/ejb/doc/reference/en/master.xml
branches/Lucene_Integration/HibernateExt/ejb/doc/reference/en/modules/architecture.xml
branches/Lucene_Integration/HibernateExt/ejb/doc/reference/en/modules/configuration.xml
branches/Lucene_Integration/HibernateExt/ejb/doc/reference/en/modules/listeners.xml
branches/Lucene_Integration/HibernateExt/ejb/lib/README.txt
branches/Lucene_Integration/HibernateExt/ejb/lib/ejb3-persistence.jar
branches/Lucene_Integration/HibernateExt/ejb/lib/hibernate-annotations.jar
branches/Lucene_Integration/HibernateExt/ejb/lib/javassist.jar
branches/Lucene_Integration/HibernateExt/ejb/lib/jboss-archive-browsing.jar
branches/Lucene_Integration/HibernateExt/ejb/readme.txt
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/CurrentEntityManagerImpl.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/EntityManagerImpl.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernatePersistence.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/QueryImpl.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/TransactionImpl.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/event/BeanCallback.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/event/CallbackResolver.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/event/ListenerCallback.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging/JarVisitor.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging/PersistenceMetadata.java
branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging/XmlHelper.java
branches/Lucene_Integration/HibernateExt/ejb/src/test-resources/explicitpar/META-INF/persistence.xml
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/QueryTest.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/emops/GetReferenceTest.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/emops/MergeTest.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/emops/Race.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/emops/RemoveTest.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/exception/ExceptionTest.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/exception/Music.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/packaging/JarVisitorTest.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/transaction/Book.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/xml/XmlTest.java
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/xml/orm.xml
branches/Lucene_Integration/HibernateExt/ejb/src/test/org/hibernate/ejb/test/xml/orm2.xml
branches/Lucene_Integration/HibernateExt/metadata/build.xml
branches/Lucene_Integration/HibernateExt/metadata/changelog.txt
branches/Lucene_Integration/HibernateExt/metadata/doc/reference/en/master.xml
branches/Lucene_Integration/HibernateExt/metadata/doc/reference/en/modules/entity.xml
branches/Lucene_Integration/HibernateExt/metadata/doc/reference/en/modules/lucene.xml
branches/Lucene_Integration/HibernateExt/metadata/doc/reference/en/modules/setup.xml
branches/Lucene_Integration/HibernateExt/metadata/doc/reference/en/modules/validator.xml
branches/Lucene_Integration/HibernateExt/metadata/doc/reference/en/modules/xml-overriding.xml
branches/Lucene_Integration/HibernateExt/metadata/lib/README.txt
branches/Lucene_Integration/HibernateExt/metadata/lib/ejb3-persistence.jar
branches/Lucene_Integration/HibernateExt/metadata/readme.txt
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/annotationfactory/AnnotationFactory.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/annotations/Filter.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/annotations/Filters.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/annotations/FlushModeType.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/annotations/Where.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/AbstractPropertyHolder.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationBinder.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/AnnotationConfiguration.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/BinderHelper.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/ClassPropertyHolder.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/CollectionPropertyHolder.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/ComponentPropertyHolder.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/CreateKeySecondPass.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/Ejb3Column.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/Ejb3JoinColumn.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/ExtendedMappings.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/FkSecondPass.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/IndexColumn.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/IndexSecondPass.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/OneToOneSecondPass.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyHolder.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/PropertyHolderBuilder.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/CollectionBinder.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/EntityBinder.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ListBinder.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/MapBinder.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/PropertyBinder.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/QueryBinder.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/SimpleValueBinder.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/TableBinder.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/cfg/annotations/Version.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/event/LuceneEventListener.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProvider.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/store/DirectoryProviderFactory.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/store/FSDirectoryProvider.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/lucene/store/RAMDirectoryProvider.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/reflection/java/EJB3OverridenAnnotationReader.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXAnnotatedElement.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXArrayType.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXClass.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXCollectionType.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/reflection/java/JavaXFactory.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/reflection/java/Pair.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/reflection/java/generics/CompoundTypeEnvironment.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/reflection/java/xml/XMLContext.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/type/ByteArrayBlobType.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/type/CharacterArrayClobType.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/type/EnumType.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/validator/ClassValidator.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/validator/MaxValidator.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/validator/MinValidator.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/validator/RangeValidator.java
branches/Lucene_Integration/HibernateExt/metadata/src/java/org/hibernate/validator/event/ValidateEventListener.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/ValidatorMessages.properties
branches/Lucene_Integration/HibernateExt/metadata/src/test/ValidatorMessages_da.properties
branches/Lucene_Integration/HibernateExt/metadata/src/test/ValidatorMessages_fr.properties
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/lucene/test/Document.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/collectionelement/Boy.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/collectionelement/Brand.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/entity/Java5FeaturesTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/generics/Gene.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Ball.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/Dog.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/id/IdTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/indexcoll/Atmosphere.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/singletable/Building.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/inheritance/singletable/SingleTableTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/manytomany/Group.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/manytomany/Woman.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/manytoone/Car.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/manytoone/ForestType.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/manytoone/ManyToOneTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/onetomany/City.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/onetomany/OneToManyTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/onetomany/Street.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/onetomany/Trainer.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/onetoone/OneToOneTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/override/Trip.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/query/Dimensions.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/annotations/query/QueryTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/JavaXClassTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/Administration.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/EJB3OverridenAnnotationReaderTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/test/reflection/java/xml/metadata-complete.xml
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/validator/test/HibernateAnnotationIntegrationTest.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/validator/test/Tv.java
branches/Lucene_Integration/HibernateExt/metadata/src/test/org/hibernate/validator/test/ValidatorTest.java
branches/Lucene_Integration/HibernateExt/tools/build.xml
branches/Lucene_Integration/HibernateExt/tools/changelog.txt
branches/Lucene_Integration/HibernateExt/tools/doc/reference/en/master.xml
branches/Lucene_Integration/HibernateExt/tools/doc/reference/en/modules/ant.xml
branches/Lucene_Integration/HibernateExt/tools/doc/reference/en/modules/codegenarchitecture.xml
branches/Lucene_Integration/HibernateExt/tools/doc/reference/en/modules/plugins.xml
branches/Lucene_Integration/HibernateExt/tools/doc/reference/en/modules/reverseengineering.xml
branches/Lucene_Integration/HibernateExt/tools/lib/testlibs/ejb3-persistence.jar
branches/Lucene_Integration/HibernateExt/tools/lib/testlibs/hibernate-annotations.jar
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCReaderFactory.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/DefaultReverseEngineeringStrategy.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/DelegatingReverseEngineeringStrategy.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/JDBCReader.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideBinder.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/OverrideRepository.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/ReverseEngineeringSettings.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/ReverseEngineeringStrategy.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/TableFilter.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/JDBCMetaDataDialect.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/dialect/ResultSetIterator.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/hibernate-reverse-engineering-3.0.dtd
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/ant/ExporterTask.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/ant/GenericExporterTask.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/ant/HibernateToolTask.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/ant/JDBCConfigurationTask.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/AbstractExporter.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Cfg2HbmTool.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Cfg2JavaTool.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/DAOExporter.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/DocExporter.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/Exporter.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/GenericExporter.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/HibernateMappingExporter.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/MetaAttributeHelper.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/POJOExporter.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/StringUtils.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/TemplateHelper.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/TemplateProducer.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/XMLPrettyPrinter.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocFileManager.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocHelper.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/jtidy.properties
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/BasicPOJOClass.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/ComponentPOJOClass.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/EntityPOJOClass.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/pojo/POJOClass.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/seam/SeamExporter.java
branches/Lucene_Integration/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/visitor/DefaultValueVisitor.java
branches/Lucene_Integration/HibernateExt/tools/src/templates/dao/daohome.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/doc/entities/summary.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/doc/index.html
branches/Lucene_Integration/HibernateExt/tools/src/templates/doc/tables/summary.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/hbm/array.hbm.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/hbm/bag.hbm.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/hbm/component.hbm.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/hbm/id.hbm.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/hbm/list.hbm.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/hbm/many-to-one.hbm.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/hbm/persistentclass.hbm.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/hbm/primitive-array.hbm.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/hbm/property.hbm.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/hbm/set.hbm.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/hbm/timestamp.hbm.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/hbm/version.hbm.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/pojo/PojoConstructors.ftl
branches/Lucene_Integration/HibernateExt/tools/src/templates/seam/selector.java.ftl
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/BaseTestCase.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/NonReflectiveTestCase.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/ant/HibernateToolTest.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/ant/SeamAntTest.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Constructors.hbm.xml
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/DocExporterTest.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/GenericExporterTest.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2DaoTest.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2JavaConstructorTest.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/Hbm2XAllTests.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/XMLPrettyPrinterTest.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Basic.hbm.xml
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Cfg2HbmAllTests.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/ManyToManyTest.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/test/TestHelper.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/Jdbc2CfgAllTests.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/PersistentClassesTest.java
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/foreignkeytest.reveng.xml
branches/Lucene_Integration/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/overridetest.reveng.xml
branches/Lucene_Integration/HibernateExt/tools/src/testsupport/NoopReverseEngineeringStrategy.java
branches/Lucene_Integration/HibernateExt/tools/src/testsupport/anttest-build.xml
Log:
Painful and stupidly complex Merge from trunk
ANN-387 initial work on inheritance
Modified: branches/Lucene_Integration/HibernateExt/build.bat
===================================================================
(Binary files differ)
Modified: branches/Lucene_Integration/HibernateExt/ejb/build.xml
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/build.xml 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/build.xml 2006-10-11 04:01:11 UTC (rev 10566)
@@ -16,7 +16,7 @@
<!-- Name of project and version, used to create filenames -->
<property name="Name" value="Hibernate EntityManager"/>
<property name="name" value="hibernate-entitymanager"/>
- <property name="version" value="3.2.0.CR1"/>
+ <property name="version" value="3.2.0.CR3"/>
<property name="javadoc.packagenames" value="org.hibernate.ejb.*"/>
<property name="jdbc.dir" value="jdbc"/>
<property name="copy.test" value="true"/>
Modified: branches/Lucene_Integration/HibernateExt/ejb/changelog.txt
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/changelog.txt 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/changelog.txt 2006-10-11 04:01:11 UTC (rev 10566)
@@ -1,6 +1,63 @@
Hibernate EntityManager Changelog
==================================
+3.2.0.CR3 (4-10-2006)
+----------------------
+** Bug
+ * [EJB-150] - JarVisitor.addElement does not close passed input streams
+ * [EJB-221] - TransientObjectException with FetchType.LAZY on @ManyToOne and field access on target entity
+ * [EJB-231] - Optimistic locking exception could lead to java.lang.IllegalArgumentException: id to load is required for loading
+
+
+** Improvement
+ * [EJB-234] - Inefficiency during the flush operation
+
+
+3.2.0.CR2 (16-09-2006)
+----------------------
+** Bug
+ * [EJB-98] - EntityManager.find() throws an org.hibernate.ObjectDeletedException if you find something deleted in the same TXA
+ * [EJB-148] - Incorrect exception when @CollectionOfElement is used with @Where and FetchType is EAGER
+ * [EJB-174] - Ejb3Configuration can't open EJB Jar file with persistence.xml in Oracle OC4J server (Jifeng Liu)
+ * [EJB-181] - ExplodedJarVisitor and paths with white spaces
+ * [EJB-185] - Some EJB3 exceptions does not support nested exceptions
+ * [EJB-187] - RuntimeException raised in CallBack methods should be left as is
+ * [EJB-188] - @PostUpdate can be called even if @PreUpdate is not when object is in DELETED state
+ * [EJB-189] - em.getReference() should raise IllegalArgumentException if the id is of the wrong type
+ * [EJB-190] - Query.setParameter() should raise an IllegalArgumentException if the parameter does not exist
+ * [EJB-191] - Incoherent usage of getResultList(), executeUpdate() or getSingleResult() regarding the DML/Select style should raise an IllegalStateException
+ * [EJB-194] - Removing a detached instance is not allowed
+ * [EJB-195] - Wrong query should raise an IllegalArgumentException
+ * [EJB-196] - referencing a transient instance while flushing an association non cascaded should raise IllegalStateException
+ * [EJB-198] - On em.close(), tries to register the transaction even if the transaction is marked for rollback
+ * [EJB-202] - Inaccurate exception message for setFirstResult in QueryImpl
+ * [EJB-203] - exception when using top-level <access>PROPERTY</access> in orm.xml
+ * [EJB-204] - ClassCastException when using <mapped-superclass> in orm.xml
+ * [EJB-205] - refresh() should raise IllegalArgumentException if the entity is not managed
+ * [EJB-207] - em.lock(..., WRITE) raise NPE on some DBs
+ * [EJB-212] - excludeUnlistedClasses ignored in SE case
+ * [EJB-214] - Native Query can not be used with parameter
+ * [EJB-215] - EntityManager fails during transaction commit after it has been closed
+ * [EJB-216] - Query.getSingleResult() whose state-field is null raise an EntityNotFoundException rather than returning null
+ * [EJB-218] - markForRollback() should not swallow the original exception
+ * [EJB-220] - Entity listener documentation contradicts EJB3 specification
+ * [EJB-223] - EntityNotFoundDelegate not Serializable
+
+
+** Improvement
+ * [EJB-82] - Query interface should support parameter lists for positions
+ * [EJB-182] - Add Websphere proprietary jar protocol
+ * [EJB-186] - Set the default cache provider to NoCache to prevent PU misuse to raise exceptions
+ * [EJB-201] - Ejb3Configuration should output a warning if no persistence.xml is found
+ * [EJB-210] - OptimisticLockStrategy should expose the underlying stale entity
+ * [EJB-211] - JavaDoc the EJB 3 API
+
+** New Feature
+ * [EJB-154] - Allow to create/configure an EJB3Configuration without building a sessionfactory
+ * [EJB-160] - Push EJB3Configuration and SessionFactory into JNDI
+ * [EJB-184] - Add EM property for FlushMode
+
+
3.2.0.CR1 (13-05-2006)
----------------------
** Bug
Modified: branches/Lucene_Integration/HibernateExt/ejb/doc/reference/en/master.xml
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/doc/reference/en/master.xml 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/doc/reference/en/master.xml 2006-10-11 04:01:11 UTC (rev 10566)
@@ -16,7 +16,7 @@
<subtitle>User guide</subtitle>
- <releaseinfo>3.2.0 CR1</releaseinfo>
+ <releaseinfo>3.2.0 CR3</releaseinfo>
<mediaobject>
<imageobject>
Modified: branches/Lucene_Integration/HibernateExt/ejb/doc/reference/en/modules/architecture.xml
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/doc/reference/en/modules/architecture.xml 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/doc/reference/en/modules/architecture.xml 2006-10-11 04:01:11 UTC (rev 10566)
@@ -194,8 +194,8 @@
entity managers.</para>
<para>In a transaction-scoped container managed entity manager (common
- case in a J2EE environment), the JTA transaction propagation is the same
- as the persistence context resource propagation. In other words,
+ case in a Java EE environment), the JTA transaction propagation is the
+ same as the persistence context resource propagation. In other words,
container-managed transaction-scoped entity managers retrieved within a
given JTA transaction all share the same persistence context. In
Hibernate terms, this means all managers share the same session.</para>
@@ -246,21 +246,21 @@
</section>
</section>
- <section>
- <title>J2SE environments</title>
+ <section id="architecture-javase" revision="1">
+ <title>Java SE environments</title>
- <para>In a J2SE environment only extented context application-managed
+ <para>In a Java SE environment only extented context application-managed
entity managers are available. You can retrieve an entity manger using the
<literal>EntityManagerFactory</literal> API. Only resource-local entity
managers are available. In other words, JTA transactions and persistence
- context propagation are not supported in J2SE (you will have to propagate
- the persistence context yourself, e.g. using the thread local session
- pattern popular in the Hibernate community).</para>
+ context propagation are not supported in Java SE (you will have to
+ propagate the persistence context yourself, e.g. using the thread local
+ session pattern popular in the Hibernate community).</para>
<para>Extended context means that a persistence context is created when
the entity manager is retrieved (using
- <literal>EntityManagerFactory.createEntityManager(EXTENDED)</literal> )
- and closed when the entity manager is closed. Many resource-local
- transaction share the same persistence context, in this case.</para>
+ <literal>EntityManagerFactory.createEntityManager(...)</literal> ) and
+ closed when the entity manager is closed. Many resource-local transaction
+ share the same persistence context, in this case.</para>
</section>
</chapter>
\ No newline at end of file
Modified: branches/Lucene_Integration/HibernateExt/ejb/doc/reference/en/modules/configuration.xml
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/doc/reference/en/modules/configuration.xml 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/doc/reference/en/modules/configuration.xml 2006-10-11 04:01:11 UTC (rev 10566)
@@ -5,13 +5,14 @@
<section>
<title>Setup</title>
- <para>The EJB3 compatible Hibernate EntityManager is built on top of
- Hibernate core and Hibernate Annotations. You have to use compatible
- versions of each module. This version is known to work on Hibernate
- 3.2.0.CR2 and Hibernate Annotations 3.2.0.CR1. The following libraries
- have to be in your classpath: hibernate3.jar, hibernate-annotations.jar,
- hibernate-entity-manager.jar and all needed third party libraries for each
- package.(incl. ejb-persistence.jar).</para>
+ <para>The EJB 3.0 / JPA compatible Hibernate EntityManager is built on top
+ of Hibernate core and Hibernate Annotations. You have to use compatible
+ versions of each module. This version is known to work on Hibernate Core
+ 3.2.0.CR5 (and 3.2.0.GA at the time of writing) and Hibernate Annotations
+ 3.2.0.CR3. The following libraries have to be in your classpath:
+ hibernate3.jar, hibernate-annotations.jar, hibernate-entitymanager.jar and
+ all needed third party libraries for each package.(incl.
+ ejb-persistence.jar).</para>
</section>
<section id="setup-configuration"
@@ -431,7 +432,7 @@
.addClass( NonAnnotatedClass.class ) //add an hbm.xml file using the Hibernate convention
.addRerousce( "mypath/MyOtherCLass.hbm.xml ) //add an hbm.xml file
.addRerousce( "mypath/orm.xml ) //add an EJB3 deployment descriptor
- .createEntityManagerFactory(); //Create the entity manager factory</programlisting>
+ .buildEntityManagerFactory(); //Create the entity manager factory</programlisting>
</section>
</section>
@@ -577,7 +578,7 @@
</section>
<section>
- <title>Obtaining an EntityManager in a J2SE environment</title>
+ <title>Obtaining an EntityManager in a Java SE environment</title>
<para>An entity manager factory should be considered as an immutable
configuration holder, it is defined to point to a single datasource and to
Modified: branches/Lucene_Integration/HibernateExt/ejb/doc/reference/en/modules/listeners.xml
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/doc/reference/en/modules/listeners.xml 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/doc/reference/en/modules/listeners.xml 2006-10-11 04:01:11 UTC (rev 10566)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<chapter id="lsiteners">
+<chapter id="listeners">
<title>Entity listeners and Callback methods</title>
<section>
@@ -64,7 +64,7 @@
have two methods being annotated by the same callback annotation whether
it is a callback method or an entity listener method. A callback method is
a no-arg method with no return type and any arbitrary name. An entity
- listener has the signature public <code>void <METHOD>(Object)</code>
+ listener has the signature <code>void <METHOD>(Object)</code>
where Object is of the actual entity type (note that Hibernate Entity
Manager relaxed this constraint and allows <literal>Object</literal> of
<literal>java.lang.Object</literal> type (allowing sharing of listeners
Modified: branches/Lucene_Integration/HibernateExt/ejb/lib/README.txt
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/lib/README.txt 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/lib/README.txt 2006-10-11 04:01:11 UTC (rev 10566)
@@ -1,7 +1,7 @@
Hibernate Metadata dependencies
===============================
-ejb3-persistence (proposed final draft): required
-hibernate-annotations (3.1beta9): required
-javassist (3.1): required
-jboss-archive-browsing (5.0.0alpha build: CVSTag=HEAD date=200507071617): required
+ejb3-persistence (final release): required
+hibernate-annotations: required
+javassist (3.3): required
+jboss-archive-browsing (5.0.0alpha build: CVSTag=HEAD date=200607201 119): required
Modified: branches/Lucene_Integration/HibernateExt/ejb/lib/ejb3-persistence.jar
===================================================================
(Binary files differ)
Modified: branches/Lucene_Integration/HibernateExt/ejb/lib/hibernate-annotations.jar
===================================================================
(Binary files differ)
Modified: branches/Lucene_Integration/HibernateExt/ejb/lib/javassist.jar
===================================================================
(Binary files differ)
Modified: branches/Lucene_Integration/HibernateExt/ejb/lib/jboss-archive-browsing.jar
===================================================================
(Binary files differ)
Modified: branches/Lucene_Integration/HibernateExt/ejb/readme.txt
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/readme.txt 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/readme.txt 2006-10-11 04:01:11 UTC (rev 10566)
@@ -1,9 +1,9 @@
Hibernate EntityManager
==================================================
-Version: 3.2.0.CR1, 13.05.2006
+Version: 3.2.0.CR3, 4.10.2006
-THIS RELEASE OF HIBERNATE ENTITYMANAGER REQUIRES HIBERNATE 3.2.0.CR2 AND DOES
-NOT WORK WITH HIBERNATE 3.1.x OR ANY OLDER VERSION OF HIBERNATE.
+THIS RELEASE OF HIBERNATE ENTITYMANAGER REQUIRES HIBERNATE CORE 3.2.0.CR5 AND
+DOES NOT WORK WITH HIBERNATE 3.1.x OR ANY OLDER VERSION OF HIBERNATE.
Description
Modified: branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2006-10-11 04:01:11 UTC (rev 10566)
@@ -44,6 +44,7 @@
import org.hibernate.TypeMismatchException;
import org.hibernate.QueryException;
import org.hibernate.TransientObjectException;
+import org.hibernate.StaleObjectStateException;
import org.hibernate.ejb.transaction.JoinableCMTTransaction;
import org.hibernate.ejb.util.ConfigurationHelper;
import org.hibernate.engine.SessionFactoryImplementor;
@@ -299,8 +300,17 @@
}
}
+ /**
+ * return a Session
+ * @throws IllegalStateException if the entity manager is closed
+ */
public abstract Session getSession();
+ /**
+ * Return a Session (even if the entity manager is closed
+ */
+ protected abstract Session getRawSession();
+
public EntityTransaction getTransaction() {
if ( transactionType == PersistenceUnitTransactionType.JTA ) {
throw new IllegalStateException( "JTA EntityManager cannot access a transactions" );
@@ -400,7 +410,7 @@
}
public boolean isTransactionInProgress() {
- return ( (SessionImplementor) getSession() ).isTransactionInProgress();
+ return ( (SessionImplementor) getRawSession() ).isTransactionInProgress();
}
protected void markAsRollback() {
@@ -409,9 +419,10 @@
tx.setRollbackOnly();
}
else {
+ //no explicit use of the tx. boudaries methods
if ( PersistenceUnitTransactionType.JTA == transactionType ) {
TransactionManager transactionManager =
- ( (SessionFactoryImplementor) getSession().getSessionFactory() ).getTransactionManager();
+ ( (SessionFactoryImplementor) getRawSession().getSessionFactory() ).getTransactionManager();
if ( transactionManager == null ) {
throw new PersistenceException(
"Using a JTA persistence context wo setting hibernate.transaction.manager_lookup_class"
@@ -441,7 +452,7 @@
final Transaction transaction = session.getTransaction();
if ( transaction != null && transaction instanceof JoinableCMTTransaction ) {
//can't handle it if not a joinnable transaction
- final JoinableCMTTransaction joinableCMTTransaction = (JoinableCMTTransaction) session.getTransaction();
+ final JoinableCMTTransaction joinableCMTTransaction = (JoinableCMTTransaction) transaction;
if ( joinableCMTTransaction.getStatus() == JoinableCMTTransaction.JoinStatus.JOINED ) {
log.debug( "Transaction already joined" );
@@ -571,13 +582,40 @@
}
public void throwPersistenceException(PersistenceException e) {
- if ( ! ( e instanceof NoResultException || ( e instanceof NonUniqueResultException ) ) ) markAsRollback();
+ if ( ! ( e instanceof NoResultException || ( e instanceof NonUniqueResultException ) ) ) {
+ try {
+ markAsRollback();
+ }
+ catch (Exception ne) {
+ //we do not want the subsequent exception to swallow the original one
+ log.error( "Unable to mark for rollback on PersistenceException: ", ne);
+ }
+ }
throw e;
}
public void throwPersistenceException(HibernateException e) {
if ( e instanceof StaleStateException ) {
- throwPersistenceException( new OptimisticLockException( e ) );
+ if ( e instanceof StaleObjectStateException ) {
+ StaleObjectStateException sose = (StaleObjectStateException) e;
+ Serializable identifier = sose.getIdentifier();
+ if (identifier != null) {
+ Object entity = getRawSession().load( sose.getEntityName(), identifier );
+ if ( entity instanceof Serializable ) {
+ //avoid some user errors regarding boundary crossing
+ throwPersistenceException( new OptimisticLockException( null, e, entity ) );
+ }
+ else {
+ throwPersistenceException( new OptimisticLockException( e ) );
+ }
+ }
+ else {
+ throwPersistenceException( new OptimisticLockException( e ) );
+ }
+ }
+ else {
+ throwPersistenceException( new OptimisticLockException( e ) );
+ }
}
else if ( e instanceof ConstraintViolationException ) {
//FIXME this is bad cause ConstraintViolationException happens in other circumstances
@@ -596,7 +634,13 @@
throw new IllegalArgumentException( e );
}
else if ( e instanceof TransientObjectException ) {
- markAsRollback();
+ try {
+ markAsRollback();
+ }
+ catch (Exception ne) {
+ //we do not want the subsequent exception to swallow the original one
+ log.error( "Unable to mark for rollback on TransientObjectException: ", ne);
+ }
throw new IllegalStateException( e ); //Spec 3.2.3 Synchronization rules
}
else {
Modified: branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/CurrentEntityManagerImpl.java
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/CurrentEntityManagerImpl.java 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/CurrentEntityManagerImpl.java 2006-10-11 04:01:11 UTC (rev 10566)
@@ -45,6 +45,10 @@
return s;
}
+ protected Session getRawSession() {
+ return getSession();
+ }
+
public void close() {
throw new UnsupportedOperationException( "cannot close the JTA-bound EntityManager" );
}
@@ -53,7 +57,7 @@
//TODO Hum contradictory comments, I'm getting mad
//no need to force enlistment in the tx, a current session is always enlisted
//adjustFlushMode(); //don't adjust, can't be done on closed EM
- getSession().isOpen(); //to force enlistment in tx
+ getRawSession().isOpen(); //to force enlistment in tx
return true;
}
Modified: branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java 2006-10-11 04:01:11 UTC (rev 10566)
@@ -2,10 +2,13 @@
package org.hibernate.ejb;
import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.net.URL;
import java.util.ArrayList;
@@ -19,6 +22,10 @@
import java.util.Properties;
import java.util.Set;
import java.util.StringTokenizer;
+import javax.naming.BinaryRefAddr;
+import javax.naming.NamingException;
+import javax.naming.Reference;
+import javax.naming.Referenceable;
import javax.persistence.Embeddable;
import javax.persistence.Entity;
import javax.persistence.EntityManagerFactory;
@@ -39,6 +46,7 @@
import org.hibernate.HibernateException;
import org.hibernate.Interceptor;
import org.hibernate.MappingException;
+import org.hibernate.MappingNotFoundException;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.AnnotationConfiguration;
import org.hibernate.cfg.Configuration;
@@ -54,6 +62,7 @@
import org.hibernate.ejb.transaction.JoinableCMTTransactionFactory;
import org.hibernate.ejb.util.ConfigurationHelper;
import org.hibernate.ejb.util.LogHelper;
+import org.hibernate.ejb.util.NamingHelper;
import org.hibernate.engine.FilterDefinition;
import org.hibernate.event.EventListeners;
import org.hibernate.mapping.AuxiliaryDatabaseObject;
@@ -71,33 +80,53 @@
import org.xml.sax.SAXException;
/**
+ * Allow a fine tuned configuration of an EJB 3.0 EntityManagerFactory
+ *
+ * A Ejb3Configuration object is only guaranteed to create one EntityManagerFactory.
+ * Multiple usage of #buildEntityManagerFactory() is not guaranteed.
+ *
+ * After #buildEntityManagerFactory() has been called, you no longer can change the configuration
+ * state (no class adding, no property change etc)
+ *
+ * When serialized / deserialized or retrieved from the JNDI, you no longer can change the
+ * configuration state (no class adding, no property change etc)
+ *
+ * Putting the configuration in the JNDI is an expensive operation that requires a partial
+ * serialization
+ *
* @author Emmanuel Bernard
*/
-public class Ejb3Configuration implements Serializable {
+public class Ejb3Configuration implements Serializable, Referenceable {
private static final String IMPLEMENTATION_NAME = HibernatePersistence.class.getName();
+ private static final String META_INF_ORM_XML = "META-INF/orm.xml";
private static Log log = LogFactory.getLog( Ejb3Configuration.class );
+ private static EntityNotFoundDelegate ejb3EntityNotFoundDelegate = new Ejb3EntityNotFoundDelegate();
+ private static class Ejb3EntityNotFoundDelegate implements EntityNotFoundDelegate, Serializable {
+ public void handleEntityNotFound(String entityName, Serializable id) {
+ throw new EntityNotFoundException("Unable to find " + entityName + " with id " + id);
+ }
+ }
+
static {
Version.touch();
}
private AnnotationConfiguration cfg;
private SettingsFactory settingsFactory;
- private EventListenerConfigurator listenerConfigurator;
+ //made transient and not restored in deserialization on purpose, should no longer be called after restoration
+ private transient EventListenerConfigurator listenerConfigurator;
private PersistenceUnitTransactionType transactionType;
- private static final String META_INF_ORM_XML = "META-INF/orm.xml";
+ private boolean discardOnClose;
+ //made transient and not restored in deserialization on purpose, should no longer be called after restoration
+ private transient ClassLoader overridenClassLoader;
+
public Ejb3Configuration() {
settingsFactory = new InjectionSettingsFactory();
cfg = new AnnotationConfiguration( settingsFactory );
- cfg.setEntityNotFoundDelegate( new EntityNotFoundDelegate() {
-
- public void handleEntityNotFound(String entityName, Serializable id) {
- throw new EntityNotFoundException("Unable to find " + entityName + " with id " + id);
- }
- } );
+ cfg.setEntityNotFoundDelegate( ejb3EntityNotFoundDelegate );
listenerConfigurator = new EventListenerConfigurator( this );
- //transactionType = PersistenceUnitTransactionType.JTA; //default as per the spec
}
/**
@@ -116,8 +145,9 @@
/**
* create a factory from a parsed persistence.xml
+ * Especially the scanning of classes and additional jars is done already at this point.
*/
- private EntityManagerFactory createFactory(PersistenceMetadata metadata, Map overrides) {
+ private Ejb3Configuration configure(PersistenceMetadata metadata, Map overrides) {
log.debug( "Creating Factory: " + metadata.getName() );
Map workingVars = new HashMap();
@@ -145,27 +175,32 @@
Properties props = new Properties();
props.putAll( metadata.getProps() );
if ( overrides != null ) props.putAll( overrides ); //yuk!
- return createEntityManagerFactory( props, workingVars );
+ configure( props, workingVars );
+ return this;
}
/**
- * Get an entity manager factory by its entity manager name and given the
+ * Build the configuration from an entity manager name and given the
* appropriate extra properties. Those properties override the one get through
* the peristence.xml file.
+ * If the persistence unit name is not found or does not match the Persistence Provider, null is returned
*
- * @param emName entity manager name
+ * @param persistenceUnitName persistence unit name
* @param integration properties passed to the persistence provider
- * @return initialized EntityManagerFactory
+ * @return configured Ejb3Configuration or null if no persistence unit match
*/
- public EntityManagerFactory createEntityManagerFactory(String emName, Map integration) {
+ public Ejb3Configuration configure(String persistenceUnitName, Map integration) {
try {
- log.debug( "Trying to find persistence unit: " + emName );
+ log.debug( "Look up for persistence unit: " + persistenceUnitName );
integration = integration == null ?
- integration = CollectionHelper.EMPTY_MAP :
+ CollectionHelper.EMPTY_MAP :
Collections.unmodifiableMap( integration );
Enumeration<URL> xmls = Thread.currentThread()
.getContextClassLoader()
.getResources( "META-INF/persistence.xml" );
+ if ( ! xmls.hasMoreElements() ) {
+ log.info( "Could not find any META-INF/persistence.xml file in the classpath");
+ }
while ( xmls.hasMoreElements() ) {
URL url = xmls.nextElement();
log.trace( "Analyse of persistence.xml: " + url );
@@ -175,31 +210,29 @@
cfg.getEntityResolver()
);
for ( PersistenceMetadata metadata : metadataFiles ) {
- JarVisitor.Filter[] filters = getFilters( metadata.getProps(), integration, metadata.getMappingFiles() );
+ log.trace( metadata.toString() );
if ( metadata.getProvider() == null || IMPLEMENTATION_NAME.equalsIgnoreCase(
metadata.getProvider()
) ) {
- log.trace( "Archive to be processed by hibernate Entity Manager implementation found" );
//correct provider
URL jarURL = JarVisitor.getJarURLFromURLEntry( url, "/META-INF/persistence.xml" );
- JarVisitor visitor = JarVisitor.getVisitor( jarURL, filters );
+ JarVisitor.Filter[] persistenceXmlFilter = getFilters( metadata, integration, metadata.getExcludeUnlistedClasses() );
+ JarVisitor visitor = JarVisitor.getVisitor( jarURL, persistenceXmlFilter );
if ( metadata.getName() == null ) {
metadata.setName( visitor.getUnqualifiedJarName() );
}
- if ( log.isTraceEnabled() ) log.trace( "Persistence unit name: " + metadata.getName() );
-
- log.trace( "emname:" + emName + " metadata: " + metadata.getName() );
- if ( emName == null && xmls.hasMoreElements() ) {
+ if ( persistenceUnitName == null && xmls.hasMoreElements() ) {
throw new PersistenceException( "No name provided and several persistence units found" );
}
- else if ( emName == null || metadata.getName().equals( emName ) ) {
+ else if ( persistenceUnitName == null || metadata.getName().equals( persistenceUnitName ) ) {
addMetadataFromVisitor( visitor, metadata );
+ JarVisitor.Filter[] otherXmlFilter = getFilters( metadata, integration, false );
for ( String jarFile : metadata.getJarFiles() ) {
- visitor = JarVisitor.getVisitor( jarFile, filters );
+ visitor = JarVisitor.getVisitor( jarFile, otherXmlFilter );
addMetadataFromVisitor( visitor, metadata );
}
- return createFactory( metadata, integration );
+ return configure( metadata, integration );
}
}
}
@@ -242,9 +275,10 @@
}
/**
- * Create a factory from a PersistenceInfo object
+ * Process configuration from a PersistenceUnitInfo object
+ * Typically called by the container
*/
- public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo info, Map integration) {
+ public Ejb3Configuration configure(PersistenceUnitInfo info, Map integration) {
if ( log.isDebugEnabled() ) {
log.debug( "Processing " + LogHelper.logPersistenceUnitInfo( info ) );
}
@@ -267,10 +301,14 @@
//set the classloader
Thread thread = Thread.currentThread();
ClassLoader contextClassLoader = thread.getContextClassLoader();
- if ( ! info.getClassLoader().equals( contextClassLoader ) ) {
- thread.setContextClassLoader( info.getClassLoader() );
+ boolean sameClassLoader = info.getClassLoader().equals( contextClassLoader );
+ if ( ! sameClassLoader ) {
+ overridenClassLoader = info.getClassLoader();
+ thread.setContextClassLoader( overridenClassLoader );
}
- EntityManagerFactory entityManagerFactory;
+ else {
+ overridenClassLoader = null;
+ }
try {
Map workingVars = new HashMap();
@@ -294,21 +332,21 @@
defineTransactionType( transactionType, workingVars );
// }
//workingVars.put( HibernatePersistence.TRANSACTION_TYPE, transactionType );
- boolean[] detectArtifact = getDetectedArtifacts( info.getProperties(), null );
+ boolean[] detectArtifactForOtherJars = getDetectedArtifacts( info.getProperties(), null, false );
+ boolean[] detectArtifactForMainJar = getDetectedArtifacts( info.getProperties(), null, info.excludeUnlistedClasses() );
for ( URL jar : info.getJarFileUrls() ) {
- if ( detectArtifact[0] ) scanForClasses( jar, packages, entities );
- if ( detectArtifact[1] ) scanForHbmXmlFiles( jar, hbmFiles );
+ if ( detectArtifactForOtherJars[0] ) scanForClasses( jar, packages, entities );
+ if ( detectArtifactForOtherJars[1] ) scanForHbmXmlFiles( jar, hbmFiles );
}
- if ( ! info.excludeUnlistedClasses() ) {
- if ( detectArtifact[0] ) scanForClasses( info.getPersistenceUnitRootUrl(), packages, entities );
- if ( detectArtifact[1] ) scanForHbmXmlFiles( info.getPersistenceUnitRootUrl(), hbmFiles );
- }
+ if ( detectArtifactForMainJar[0] ) scanForClasses( info.getPersistenceUnitRootUrl(), packages, entities );
+ if ( detectArtifactForMainJar[1] ) scanForHbmXmlFiles( info.getPersistenceUnitRootUrl(), hbmFiles );
Properties properties = info.getProperties() != null ?
info.getProperties() :
new Properties();
ConfigurationHelper.overrideProperties( properties, integration );
+ //FIXME entities is used to enhance classes and to collect annotated entities this should not be mixed
//fill up entities with the on found in xml files
addXMLEntities( xmlFiles, info, entities );
@@ -344,15 +382,15 @@
);
}
- entityManagerFactory = createEntityManagerFactory( properties, workingVars );
+ configure( properties, workingVars );
}
finally {
//After EMF, set the CCL back
- if ( ! info.getClassLoader().equals( contextClassLoader ) ) {
+ if ( ! sameClassLoader ) {
thread.setContextClassLoader( contextClassLoader );
}
}
- return entityManagerFactory;
+ return this;
}
private void addXMLEntities(List<String> xmlFiles, PersistenceUnitInfo info, List<String> entities) {
@@ -414,7 +452,7 @@
}
}
else if ( rootElement != null && "hibernate-mappings".equals( rootElement.getName() ) ) {
- //TODO
+ //FIXME include hbm xml entities to enhance them but entities is also used to collect annotated entities
}
}
catch (DocumentException e) {
@@ -458,7 +496,7 @@
return this;
}
- private boolean[] getDetectedArtifacts(Properties properties, Map overridenProperties) {
+ private boolean[] getDetectedArtifacts(Properties properties, Map overridenProperties, boolean excludeIfNotOverriden) {
boolean[] result = new boolean[2];
result[0] = false; //detect classes
result[1] = false; //detect hbm
@@ -466,9 +504,16 @@
(String) overridenProperties.get( HibernatePersistence.AUTODETECTION ) :
null;
detect = detect == null ?
- properties.getProperty( HibernatePersistence.AUTODETECTION, "class,hbm" ) :
+ properties.getProperty( HibernatePersistence.AUTODETECTION) :
detect;
- StringTokenizer st = new StringTokenizer( detect, ",", false );
+ if (detect == null && excludeIfNotOverriden) {
+ //not overriden so we comply with the spec
+ return result;
+ }
+ else if (detect == null){
+ detect = "class,hbm";
+ }
+ StringTokenizer st = new StringTokenizer( detect, ", ", false );
while ( st.hasMoreElements() ) {
String element = (String) st.nextElement();
if ( "class".equalsIgnoreCase( element ) ) result[0] = true;
@@ -478,9 +523,12 @@
return result;
}
- private JarVisitor.Filter[] getFilters(Properties properties, Map overridenProperties, final List<String> mappingFiles) {
- boolean[] result = getDetectedArtifacts( properties, overridenProperties );
- int size = ( result[0] ? 2 : 0 ) + 1; //( result[1] ? 1 : 0 );
+ private JarVisitor.Filter[] getFilters(PersistenceMetadata metadata, Map overridenProperties, boolean excludeIfNotOverriden) {
+ Properties properties = metadata.getProps();
+ final List<String> mappingFiles = metadata.getMappingFiles();
+ boolean[] result = getDetectedArtifacts( properties, overridenProperties, excludeIfNotOverriden );
+
+ int size = ( result[0] ? 2 : 0 ) + 1; //class involves classes and packages, xml files are always involved because of orm.xml
JarVisitor.Filter[] filters = new JarVisitor.Filter[size];
if ( result[0] ) {
filters[0] = new JarVisitor.PackageFilter( false, null ) {
@@ -604,6 +652,7 @@
* HibernatePersistence.LOADED_CLASSES -> Collection<Class> (list of loaded classes)
* <p/>
* <b>Used by JBoss AS only</b>
+ * @deprecated use the Java Persistence API
*/
// This is used directly by JBoss so don't remove until further notice. bill at jboss.org
public EntityManagerFactory createEntityManagerFactory(Map workingVars) {
@@ -616,28 +665,76 @@
props.remove( HibernatePersistence.HBXML_FILES );
props.remove( HibernatePersistence.LOADED_CLASSES );
}
- return createEntityManagerFactory( props, workingVars );
+ configure( props, workingVars );
+ return buildEntityManagerFactory();
}
/**
- * Create an EntityManagerFactory <b>when</b> the configuration is ready
+ * Process configuration and build an EntityManagerFactory <b>when</b> the configuration is ready
+ * @deprecated
*/
public EntityManagerFactory createEntityManagerFactory() {
- return createEntityManagerFactory( cfg.getProperties(), new HashMap() );
+ configure( cfg.getProperties(), new HashMap() );
+ return buildEntityManagerFactory();
}
- private EntityManagerFactory buildEntityManagerFactory(boolean discardOnClose) {
- return new EntityManagerFactoryImpl(
- cfg.buildSessionFactory(),
- transactionType,
- discardOnClose
+ public EntityManagerFactory buildEntityManagerFactory() {
+ Thread thread = null;
+ ClassLoader contextClassLoader = null;
+ if (overridenClassLoader != null) {
+ thread = Thread.currentThread();
+ contextClassLoader = thread.getContextClassLoader();
+ thread.setContextClassLoader( overridenClassLoader );
+ }
+ try {
+ NamingHelper.bind(this);
+ return new EntityManagerFactoryImpl(
+ cfg.buildSessionFactory(),
+ transactionType,
+ discardOnClose
+ );
+ }
+ catch (HibernateException e) {
+ throw new PersistenceException( e );
+ }
+ finally {
+ if (thread != null) {
+ thread.setContextClassLoader( contextClassLoader );
+ }
+ }
+ }
+
+ public Reference getReference() throws NamingException {
+ log.debug("Returning a Reference to the Ejb3Configuration");
+ ByteArrayOutputStream stream = new ByteArrayOutputStream();
+ ObjectOutput out = null;
+ byte[] serialized;
+ try {
+ out = new ObjectOutputStream( stream );
+ out.writeObject( this );
+ out.close();
+ serialized = stream.toByteArray();
+ stream.close();
+ }
+ catch (IOException e) {
+ NamingException namingException = new NamingException( "Unable to serialize Ejb3Configuration" );
+ namingException.setRootCause( e );
+ throw namingException;
+ }
+
+ return new Reference(
+ Ejb3Configuration.class.getName(),
+ new BinaryRefAddr("object", serialized ),
+ Ejb3ConfigurationObjectFactory.class.getName(),
+ null
);
}
/**
* create a factory from a canonical workingVars map and the overriden properties
+ *
*/
- private EntityManagerFactory createEntityManagerFactory(
+ private Ejb3Configuration configure(
Properties properties, Map workingVars
) {
Properties preparedProperties = prepareProperties( properties, workingVars );
@@ -754,9 +851,9 @@
if ( ! "true".equalsIgnoreCase( cfg.getProperty( Environment.AUTOCOMMIT ) ) ) {
log.warn( Environment.AUTOCOMMIT + " = false break the EJB3 specification" );
}
- boolean discardOnClose = preparedProperties.getProperty( HibernatePersistence.DISCARD_PC_ON_CLOSE )
+ discardOnClose = preparedProperties.getProperty( HibernatePersistence.DISCARD_PC_ON_CLOSE )
.equals( "true" );
- return buildEntityManagerFactory( discardOnClose );
+ return this;
}
private void addClassesToSessionFactory(Map workingVars) {
@@ -790,7 +887,7 @@
if ( xmlFile.endsWith( META_INF_ORM_XML ) ) useMetaInf = true;
cfg.addResource( xmlFile );
}
- catch( MappingException me ) {
+ catch( MappingNotFoundException e ) {
if ( ! xmlFile.endsWith( META_INF_ORM_XML ) ) {
throw new PersistenceException( getExceptionHeader(workingVars)
+ "Unable to find XML mapping file in classpath: " + xmlFile);
@@ -800,6 +897,10 @@
//swallow it, the META-INF/orm.xml is optional
}
}
+ catch( MappingException me ) {
+ throw new PersistenceException( getExceptionHeader(workingVars)
+ + "Error while reading JPA XML file: " + xmlFile, me);
+ }
if ( log.isInfoEnabled() ) {
if ( Boolean.TRUE.equals( useMetaInf ) ) {
log.info( getExceptionHeader( workingVars ) + META_INF_ORM_XML + " found");
@@ -815,6 +916,7 @@
HibernatePersistence.HBXML_FILES
);
for ( InputStream is : hbmXmlFiles ) {
+ //addInputStream has the responsibility to close the stream
cfg.addInputStream( is );
}
}
@@ -973,7 +1075,19 @@
public Settings buildSettings() throws HibernateException {
- return settingsFactory.buildSettings( cfg.getProperties() );
+ Thread thread = null;
+ ClassLoader contextClassLoader = null;
+ if (overridenClassLoader != null) {
+ thread = Thread.currentThread();
+ contextClassLoader = thread.getContextClassLoader();
+ thread.setContextClassLoader( overridenClassLoader );
+ }
+ try {
+ return settingsFactory.buildSettings( cfg.getProperties() );
+ }
+ finally {
+ if (thread != null) thread.setContextClassLoader( contextClassLoader );
+ }
}
public Ejb3Configuration addProperties(Properties props) {
@@ -982,41 +1096,139 @@
}
public Ejb3Configuration addAnnotatedClass(Class persistentClass) throws MappingException {
- cfg.addAnnotatedClass( persistentClass );
- return this;
+ Thread thread = null;
+ ClassLoader contextClassLoader = null;
+ if (overridenClassLoader != null) {
+ thread = Thread.currentThread();
+ contextClassLoader = thread.getContextClassLoader();
+ thread.setContextClassLoader( overridenClassLoader );
+ }
+ try {
+ cfg.addAnnotatedClass( persistentClass );
+ return this;
+ }
+ finally {
+ if (thread != null) thread.setContextClassLoader( contextClassLoader );
+ }
}
public Ejb3Configuration configure(String resource) throws HibernateException {
- cfg.configure( resource );
- return this;
+ Thread thread = null;
+ ClassLoader contextClassLoader = null;
+ if (overridenClassLoader != null) {
+ thread = Thread.currentThread();
+ contextClassLoader = thread.getContextClassLoader();
+ thread.setContextClassLoader( overridenClassLoader );
+ }
+ try {
+ Properties properties = new Properties();
+ properties.setProperty( HibernatePersistence.CFG_FILE, resource);
+ configure( properties, new HashMap() );
+ return this;
+ }
+ finally {
+ if (thread != null) thread.setContextClassLoader( contextClassLoader );
+ }
}
public Ejb3Configuration addPackage(String packageName) throws MappingException {
- cfg.addPackage( packageName );
- return this;
+ Thread thread = null;
+ ClassLoader contextClassLoader = null;
+ if (overridenClassLoader != null) {
+ thread = Thread.currentThread();
+ contextClassLoader = thread.getContextClassLoader();
+ thread.setContextClassLoader( overridenClassLoader );
+ }
+ try {
+ cfg.addPackage( packageName );
+ return this;
+ }
+ finally {
+ if (thread != null) thread.setContextClassLoader( contextClassLoader );
+ }
}
public Ejb3Configuration addFile(String xmlFile) throws MappingException {
- cfg.addFile( xmlFile );
- return this;
+ Thread thread = null;
+ ClassLoader contextClassLoader = null;
+ if (overridenClassLoader != null) {
+ thread = Thread.currentThread();
+ contextClassLoader = thread.getContextClassLoader();
+ thread.setContextClassLoader( overridenClassLoader );
+ }
+ try {
+ cfg.addFile( xmlFile );
+ return this;
+ }
+ finally {
+ if (thread != null) thread.setContextClassLoader( contextClassLoader );
+ }
}
public Ejb3Configuration addClass(Class persistentClass) throws MappingException {
- cfg.addClass( persistentClass );
- return this;
+ Thread thread = null;
+ ClassLoader contextClassLoader = null;
+ if (overridenClassLoader != null) {
+ thread = Thread.currentThread();
+ contextClassLoader = thread.getContextClassLoader();
+ thread.setContextClassLoader( overridenClassLoader );
+ }
+ try {
+ cfg.addClass( persistentClass );
+ return this;
+ }
+ finally {
+ if (thread != null) thread.setContextClassLoader( contextClassLoader );
+ }
}
public Ejb3Configuration addFile(File xmlFile) throws MappingException {
- cfg.addFile( xmlFile );
- return this;
+ Thread thread = null;
+ ClassLoader contextClassLoader = null;
+ if (overridenClassLoader != null) {
+ thread = Thread.currentThread();
+ contextClassLoader = thread.getContextClassLoader();
+ thread.setContextClassLoader( overridenClassLoader );
+ }
+ try {
+ cfg.addFile( xmlFile );
+ return this;
+ }
+ finally {
+ if (thread != null) thread.setContextClassLoader( contextClassLoader );
+ }
}
public void buildMappings() {
- cfg.buildMappings();
+ Thread thread = null;
+ ClassLoader contextClassLoader = null;
+ if (overridenClassLoader != null) {
+ thread = Thread.currentThread();
+ contextClassLoader = thread.getContextClassLoader();
+ thread.setContextClassLoader( overridenClassLoader );
+ }
+ try {
+ cfg.buildMappings();
+ }
+ finally {
+ if (thread != null) thread.setContextClassLoader( contextClassLoader );
+ }
}
public Iterator getClassMappings() {
- return cfg.getClassMappings();
+ Thread thread = null;
+ ClassLoader contextClassLoader = null;
+ if (overridenClassLoader != null) {
+ thread = Thread.currentThread();
+ contextClassLoader = thread.getContextClassLoader();
+ thread.setContextClassLoader( overridenClassLoader );
+ }
+ try {
+ return cfg.getClassMappings();
+ }
+ finally {
+ if (thread != null) thread.setContextClassLoader( contextClassLoader );
+ }
}
public EventListeners getEventListeners() {
@@ -1106,13 +1318,37 @@
}
public Ejb3Configuration addInputStream(InputStream xmlInputStream) throws MappingException {
- cfg.addInputStream( xmlInputStream );
- return this;
+ Thread thread = null;
+ ClassLoader contextClassLoader = null;
+ if (overridenClassLoader != null) {
+ thread = Thread.currentThread();
+ contextClassLoader = thread.getContextClassLoader();
+ thread.setContextClassLoader( overridenClassLoader );
+ }
+ try {
+ cfg.addInputStream( xmlInputStream );
+ return this;
+ }
+ finally {
+ if (thread != null) thread.setContextClassLoader( contextClassLoader );
+ }
}
public Ejb3Configuration addResource(String path) throws MappingException {
- cfg.addResource( path );
- return this;
+ Thread thread = null;
+ ClassLoader contextClassLoader = null;
+ if (overridenClassLoader != null) {
+ thread = Thread.currentThread();
+ contextClassLoader = thread.getContextClassLoader();
+ thread.setContextClassLoader( overridenClassLoader );
+ }
+ try {
+ cfg.addResource( path );
+ return this;
+ }
+ finally {
+ if (thread != null) thread.setContextClassLoader( contextClassLoader );
+ }
}
public Ejb3Configuration addResource(String path, ClassLoader classLoader) throws MappingException {
Copied: branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java (from rev 10565, trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java)
Modified: branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/EntityManagerImpl.java
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/EntityManagerImpl.java 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/EntityManagerImpl.java 2006-10-11 04:01:11 UTC (rev 10566)
@@ -40,16 +40,17 @@
public Session getSession() {
if ( !open ) throw new IllegalStateException( "EntityManager is closed" );
+ return getRawSession();
+ }
+ protected Session getRawSession() {
if ( session == null ) {
session = sessionFactory.openSession();
if ( persistenceContextType == PersistenceContextType.TRANSACTION ) {
( (SessionImplementor) session ).setAutoClear( true );
}
}
-
return session;
-
}
public void close() {
@@ -64,7 +65,6 @@
}
public void afterCompletion(int i) {
- //TODO should I check for isOpen() ?
if ( session != null ) {
if ( session.isOpen() ) {
log.debug( "Closing entity manager after transaction completion" );
Modified: branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernatePersistence.java
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernatePersistence.java 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernatePersistence.java 2006-10-11 04:01:11 UTC (rev 10566)
@@ -34,21 +34,6 @@
*/
public static final String AUTODETECTION = "hibernate.archive.autodetection";
/**
- * List of classes names
- * Internal use only
- */
- public static final String CLASS_NAMES = "hibernate.ejb.classes";
- /**
- * List of annotated packages
- * Internal use only
- */
- public static final String PACKAGE_NAMES = "hibernate.ejb.packages";
- /**
- * List of classes names
- * Internal use only
- */
- public static final String XML_FILE_NAMES = "hibernate.ejb.xml_files";
- /**
* cfg.xml configuration file used
*/
public static final String CFG_FILE = "hibernate.ejb.cfgfile";
@@ -86,12 +71,33 @@
* The EJB3 compliant and default choice is false
*/
public static final String DISCARD_PC_ON_CLOSE = "hibernate.ejb.discard_pc_on_close";
+ /**
+ * Consider this as experimental
+ * It is not recommended to set up this property, the configuration is stored
+ * in the JNDI in a serialized form
+ */
+ public static final String CONFIGURATION_JNDI_NAME = "hibernate.ejb.configuration_jndi_name";
//The following properties are for Internal use only
/**
* link to the alternative Hibernate configuration file
* Internal use only
*/
+ /**
+ * List of classes names
+ * Internal use only
+ */
+ public static final String CLASS_NAMES = "hibernate.ejb.classes";
+ /**
+ * List of annotated packages
+ * Internal use only
+ */
+ public static final String PACKAGE_NAMES = "hibernate.ejb.packages";
+ /**
+ * List of classes names
+ * Internal use only
+ */
+ public static final String XML_FILE_NAMES = "hibernate.ejb.xml_files";
public static final String HBXML_FILES = "hibernate.hbmxml.files";
public static final String LOADED_CLASSES = "hibernate.ejb.loaded.classes";
public static final String JACC_CONTEXT_ID = "hibernate.jacc.ctx.id";
@@ -111,16 +117,19 @@
*/
public EntityManagerFactory createEntityManagerFactory(String persistenceUnitName, Map overridenProperties) {
Ejb3Configuration cfg = new Ejb3Configuration();
- return cfg.createEntityManagerFactory( persistenceUnitName, overridenProperties );
+ cfg.configure( persistenceUnitName, overridenProperties );
+ return cfg.buildEntityManagerFactory();
}
public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo info, Map map) {
Ejb3Configuration cfg = new Ejb3Configuration();
- return cfg.createContainerEntityManagerFactory( info, map );
+ cfg.configure( info, map );
+ return cfg.buildEntityManagerFactory();
}
/**
* create a factory from a canonical version
+ * @deprecated
*/
// This is used directly by JBoss so don't remove until further notice. bill at jboss.org
public EntityManagerFactory createEntityManagerFactory(Map properties) {
Modified: branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/QueryImpl.java
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/QueryImpl.java 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/QueryImpl.java 2006-10-11 04:01:11 UTC (rev 10566)
@@ -7,6 +7,7 @@
import java.util.List;
import javax.persistence.FlushModeType;
import javax.persistence.NoResultException;
+import javax.persistence.NonUniqueResultException;
import javax.persistence.Query;
import javax.persistence.TemporalType;
import static javax.persistence.TemporalType.*;
@@ -16,7 +17,6 @@
import org.hibernate.FlushMode;
import org.hibernate.HibernateException;
import org.hibernate.QueryParameterException;
-import org.hibernate.SQLQuery;
import org.hibernate.TypeMismatchException;
import org.hibernate.ejb.util.ConfigurationHelper;
import org.hibernate.hql.QueryExecutionRequestException;
@@ -28,6 +28,7 @@
public class QueryImpl implements Query, HibernateQuery {
private org.hibernate.Query query;
private HibernateEntityManagerImplementor em;
+ private Boolean isPositional = null;
public QueryImpl(org.hibernate.Query query, AbstractEntityManagerImpl em) {
this.query = query;
@@ -76,13 +77,17 @@
public Object getSingleResult() {
try {
- Object result = query.uniqueResult();
-
- if ( result == null ) {
+ List result = query.list();
+ if ( result.size() == 0 ) {
em.throwPersistenceException( new NoResultException( "No entity found for query" ) );
}
-
- return result;
+ else if ( result.size() > 1 ) {
+ em.throwPersistenceException( new NonUniqueResultException( "result returns " + result.size() + " elements") );
+ }
+ else {
+ return result.get(0);
+ }
+ return null; //should never happen
}
catch (QueryExecutionRequestException he) {
throw new IllegalStateException(he);
@@ -113,7 +118,7 @@
throw new IllegalArgumentException(
"Negative ("
+ firstResult
- + ") parameter passed in to setMaxResults"
+ + ") parameter passed in to setFirstResult"
);
}
query.setFirstResult( firstResult );
@@ -222,7 +227,7 @@
public Query setParameter(int position, Object value) {
try {
- if ( isEJBQLQuery() ) {
+ if ( isPositionalParameter() ) {
this.setParameter( Integer.toString( position ), value );
}
else {
@@ -239,13 +244,30 @@
}
}
- private boolean isEJBQLQuery() {
- return ! ( query instanceof SQLQuery );
+ private boolean isPositionalParameter() {
+ if (isPositional == null) {
+ //compute it
+ String queryString = query.getQueryString();
+ int index = queryString.indexOf( '?' );
+ //there is a ? and the following char is a digit
+ if (index == -1) {
+ //no ?
+ isPositional = true;
+ }
+ else if ( index == queryString.length() - 1 ) {
+ // "... ?"
+ isPositional = false;
+ }
+ else {
+ isPositional = Character.isDigit( queryString.charAt( index + 1 ) );
+ }
+ }
+ return isPositional;
}
public Query setParameter(int position, Date value, TemporalType temporalType) {
try {
- if ( isEJBQLQuery() ) {
+ if ( isPositionalParameter() ) {
String name = Integer.toString( position );
this.setParameter( name, value, temporalType );
}
@@ -273,7 +295,7 @@
public Query setParameter(int position, Calendar value, TemporalType temporalType) {
try {
- if ( isEJBQLQuery() ) {
+ if ( isPositionalParameter() ) {
String name = Integer.toString( position );
this.setParameter( name, value, temporalType );
}
Modified: branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/TransactionImpl.java
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/TransactionImpl.java 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/TransactionImpl.java 2006-10-11 04:01:11 UTC (rev 10566)
@@ -82,7 +82,7 @@
finally {
try {
if (entityManager != null) {
- Session session = ( (HibernateEntityManager) entityManager ).getSession();
+ Session session = getSession();
if ( session != null && session.isOpen() ) session.clear();
}
}
Modified: branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java 2006-10-11 04:01:11 UTC (rev 10566)
@@ -8,7 +8,7 @@
* @author Emmanuel Bernard
*/
public class Version {
- public static String VERSION = "3.2.0.CR1";
+ public static final String VERSION = "3.2.0.CR3";
private static Log log = LogFactory.getLog( Version.class );
static {
Modified: branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java 2006-10-11 04:01:11 UTC (rev 10566)
@@ -2,6 +2,8 @@
package org.hibernate.ejb.connection;
import java.util.Properties;
+import java.sql.Connection;
+import java.sql.SQLException;
import javax.sql.DataSource;
import org.apache.commons.logging.Log;
@@ -18,6 +20,7 @@
* @see org.hibernate.connection.ConnectionProvider
*/
public class InjectedDataSourceConnectionProvider extends DatasourceConnectionProvider {
+ //TODO make datasource connection provider properties protected in 3.3
private String user;
private String pass;
@@ -35,4 +38,13 @@
log.info( "Using provided datasource" );
}
+ @Override
+ public Connection getConnection() throws SQLException {
+ if (user != null || pass != null) {
+ return getDataSource().getConnection(user, pass);
+ }
+ else {
+ return getDataSource().getConnection();
+ }
+ }
}
Modified: branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/event/BeanCallback.java
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/event/BeanCallback.java 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/event/BeanCallback.java 2006-10-11 04:01:11 UTC (rev 10566)
@@ -25,7 +25,7 @@
catch (InvocationTargetException e) {
//keep runtime exceptions as is
if ( e.getTargetException() instanceof RuntimeException ) {
- throw (RuntimeException) e.getCause();
+ throw (RuntimeException) e.getTargetException();
}
else {
throw new RuntimeException( e.getTargetException() );
Modified: branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/event/CallbackResolver.java
===================================================================
--- branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/event/CallbackResolver.java 2006-10-05 06:08:25 UTC (rev 10565)
+++ branches/Lucene_Integration/HibernateExt/ejb/src/java/org/hibernate/ejb/event/CallbackResolver.java 2006-10-11 04:01:11 UTC (rev 10566)
@@ -14,16 +14,14 @@
import java.util.List;
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
+import javax.persistence.ExcludeDefaultListeners;
import javax.persistence.ExcludeSuperclassListeners;
import javax.persistence.MappedSuperclass;
import javax.persistence.PersistenceException;
-import javax.persistence.ExcludeDefaultListeners;
+import org.hibernate.reflection.ReflectionManager;
import org.hibernate.reflection.XClass;
import org.hibernate.reflection.XMethod;
-import org.hibernate.reflection.ReflectionManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
@@ -32,7 +30,7 @@
public final class CallbackResolver {
private static boolean useAnnotationAnnotatedByListener;
- {
+ static {
//check whether reading annotations of annotations is useful or not
useAnnotationAnnotatedByListener = false;
Target target = (Target) EntityListeners.class.getAnnotation( Target.class );
@@ -42,7 +40,6 @@
}
}
}
- private static Log log = LogFactory.getLog( CallbackResolver.class );
private CallbackResolver() {
}
@@ -107,13 +104,13 @@
while ( currentClazz != null );
//handle default listeners
- if (! stopDefaultListeners) {
+ if ( ! stopDefaultListeners ) {
List<Class> defaultListeners = (List<Class>) reflectionManager.getDefaults().get( EntityListeners.class );
- if (defaultListeners != null) {
+ if ( defaultListeners != null ) {
int defaultListenerSize = defaultListeners.size();
- for (int i = defaultListenerSize - 1 ; i >= 0 ; i--) {
- orderedListeners.add( defau