[hibernate-commits] [hibernate/hibernate-core] ed4803: Merge branch 'master' of github.com:hibernate/hibe...

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-core Commit: ed48037692a1205f85aec08b4bd80d9199be55fb https://github.com/hibernate/hibernate-core/commit/ed48037692a1205f85aec0... Author: Strong Liu <stliu(a)hibernate.org&gt; Date: 2010-12-23 (Thu, 23 Dec 2010) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/Settings.java M hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/AbstractBatchImpl.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilder.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/NonBatchingBatch.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ConnectionManagerImpl.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcResourceRegistryImpl.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LogicalConnectionImpl.java A hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparer.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/PreparedStatementProxyHandler.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ConnectionManager.java M hibernate-core/src/main/java/org/hibernate/event/def/DefaultMergeEventListener.java M hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java R hibernate-core/src/main/java/org/hibernate/jdbc/AbstractBatcher.java R hibernate-core/src/main/java/org/hibernate/jdbc/Batcher.java R hibernate-core/src/main/java/org/hibernate/jdbc/BatcherFactory.java R hibernate-core/src/main/java/org/hibernate/jdbc/BatchingBatcher.java R hibernate-core/src/main/java/org/hibernate/jdbc/BatchingBatcherFactory.java R hibernate-core/src/main/java/org/hibernate/jdbc/NonBatchingBatcher.java R hibernate-core/src/main/java/org/hibernate/jdbc/NonBatchingBatcherFactory.java M hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java M hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java M hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java M hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java M hibernate-core/src/test/java/org/hibernate/test/annotations/various/readwriteexpression/Staff.java A hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Company.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java A hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/VicePresident.java M hibernate-core/src/test/java/org/hibernate/test/batch/BatchTest.java A hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java A hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java A hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml A hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java M hibernate-core/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeTest.java M hibernate-core/src/test/java/org/hibernate/test/component/basic/User.hbm.xml M hibernate-core/src/test/java/org/hibernate/test/filter/Product.hbm.xml M hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java M hibernate-core/src/test/java/org/hibernate/test/hql/Animal.hbm.xml M hibernate-core/src/test/java/org/hibernate/test/insertordering/InsertOrderingTest.java M hibernate-core/src/test/java/org/hibernate/test/jdbc/proxies/AggressiveReleaseTest.java M hibernate-core/src/test/java/org/hibernate/test/jdbc/proxies/BasicConnectionProxyTest.java M hibernate-core/src/test/java/org/hibernate/test/join/Person.hbm.xml M hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Person.hbm.xml M hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java M hibernate-core/src/test/java/org/hibernate/test/manytomany/batchload/BatchedManyToManyTest.java M hibernate-core/src/test/java/org/hibernate/test/subselect/Beings.hbm.xml M hibernate-core/src/test/java/org/hibernate/test/unionsubclass2/Person.hbm.xml M hibernate-core/src/test/resources/log4j.properties A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm4.xml M hibernate-ehcache/hibernate-ehcache.gradle A hibernate-ehcache/src/main/java/org/hibernate/cache/AbstractEhCacheRegionFactory.java M hibernate-ehcache/src/main/java/org/hibernate/cache/EhCache.java M hibernate-ehcache/src/main/java/org/hibernate/cache/EhCacheProvider.java A hibernate-ehcache/src/main/java/org/hibernate/cache/EhCacheRegionFactory.java M hibernate-ehcache/src/main/java/org/hibernate/cache/SingletonEhCacheProvider.java A hibernate-ehcache/src/main/java/org/hibernate/cache/SingletonEhCacheRegionFactory.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaBuilderImpl.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/CompoundPredicate.java M hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/PredicateTest.java M hibernate-envers/src/main/java/org/hibernate/envers/tools/Tools.java A hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/AuditedCollectionProxyTest.java M hibernate-infinispan/hibernate-infinispan.gradle M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampsRegionImpl.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheHelper.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/FlagAdapter.java M hibernate-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs.xml Log Message: ----------- Merge branch 'master' of github.com:hibernate/hibernate-core Commit: f97d02c61b6f25b97db4a78c4fe5f5c0e828f917 https://github.com/hibernate/hibernate-core/commit/f97d02c61b6f25b97db4a7... Author: Strong Liu <stliu(a)hibernate.org&gt; Date: 2010-12-23 (Thu, 23 Dec 2010) Changed paths: M hibernate-core/src/test/java/org/hibernate/test/annotations/generics/Classes.java Log Message: ----------- HHH-5806 mapping static inner class causes hsqldb tests fails