Commit Graph

147 Commits

Author SHA1 Message Date
Steve Ebersole af115fe5a8 Merge branch 'master' into metamodel
Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
	hibernate-core/src/main/java/org/hibernate/cache/internal/NoCachingRegionFactory.java
	hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java
	hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
	hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java
	hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/StoredProcedureCallImpl.java
	hibernate-core/src/main/java/org/hibernate/jaxb/internal/JaxbConfigurationProcessor.java
	hibernate-core/src/main/java/org/hibernate/jaxb/internal/JaxbMappingProcessor.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataBuilderImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationMetadataSourceProcessorImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/Helper.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingProcessor.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/IdentifierGeneratorResolver.java
	hibernate-core/src/main/java/org/hibernate/service/ConfigLoader.java
	hibernate-core/src/main/java/org/hibernate/service/ServiceRegistryBuilder.java
	hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
	hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java
	hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
	hibernate-core/src/main/java/org/hibernate/type/EnumType.java
	hibernate-core/src/test/java/org/hibernate/metamodel/binding/AbstractBasicBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/MetadataImplTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/IdentifierGeneratorTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/MapsIdTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileBinderTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/QueryBinderTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/BaseAnnotationIndexTestCase.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelperTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/OrmXmlParserTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/XmlHelper.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/SimpleValueBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/UnidirectionalManyToManyBindingTests.java
	hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/HibernateSequenceTest.java
	hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
	hibernate-core/src/test/java/org/hibernate/test/common/BasicTestingJdbcServiceImpl.java
	hibernate-core/src/test/java/org/hibernate/test/common/JdbcConnectionAccessImpl.java
	hibernate-core/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java
	hibernate-core/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java
	hibernate-core/src/test/java/org/hibernate/test/connections/ThreadLocalCurrentSessionTest.java
	hibernate-core/src/test/java/org/hibernate/test/events/CallbackTest.java
	hibernate-core/src/test/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java
	hibernate-core/src/test/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java
	hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java
	hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java
	hibernate-core/src/test/java/org/hibernate/test/propertyref/DoesNotWorkTest.java
	hibernate-core/src/test/java/org/hibernate/test/propertyref/DoesNotWorkWithHbmTest.java
	hibernate-core/src/test/java/org/hibernate/test/service/ClassLoaderServiceImplTest.java
	hibernate-core/src/test/resources/org/hibernate/jmx/Entity.hbm.xml
	hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/AbstractEhcacheRegionFactory.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/CallbackProcessorImpl.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/spi/JpaIntegrator.java
	hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java
	hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/tm/HibernateTransactionManagerLookup.java
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java
	hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseAnnotationBindingTestCase.java
	hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
2012-09-10 14:20:38 -05:00
Hardy Ferentschik 9e8dc3017b HHH-7571 Adding test for @CollectionTable 2012-09-07 11:55:33 +02:00
Hardy Ferentschik ebcc59f0a1 HHH-7571 Starting to process @JoinTable and @CollectionTable
Moving JoinColumn processing into association attribute
Making anonymous ExplicitHibernateTypeSource implementation its own class
2012-09-06 18:01:14 +02:00
Steve Ebersole 076eccb7a2 HHH-5188 - Use provided enum type ordinal/string when reading 2012-09-03 22:06:23 -05:00
Steve Ebersole 4ad49a02c9 HHH-7556 - Clean up packages 2012-08-28 14:12:15 -05:00
Strong Liu 8e8d681c7e Merge branch 'master' into metamodel 2012-08-23 22:54:33 +08:00
Steve Ebersole 8c1923ee05 HHH-7540 - Allow integration hooks into all steps of building a SessionFactory 2012-08-22 12:46:15 -05:00
Strong Liu cb394756c8 HHH-6109 bind sql result mapping and named query 2012-08-17 17:45:26 +08:00
Strong Liu 7a82349f75 HHH-7385 change to use gradle 1.1 2012-08-08 17:09:11 +08:00
Hardy Ferentschik c62789ff62 HHH-7500 Using logger instead of system out 2012-08-03 13:23:11 +02:00
Hardy Ferentschik 39f509e886 HHH-7500 Moving BaseAnnotationBindingTest into the testing module. This way it can be reused by other annotation based tests 2012-08-03 13:18:37 +02:00
Gail Badner f79001e675 HHH-7500 HHH-7497 : Use new metamodel and validate expected failures by default; add/remove @FailureExpectedWithNewMetamodel as necessary 2012-08-03 00:28:11 -07:00
Hardy Ferentschik a5f64e2d03 HHH-7484 typo 2012-08-01 13:37:51 +02:00
Strong Liu 7f3ad01b50 HHH-7495 HHH-7492 Move RegionFactory to session factory scope service registry 2012-08-01 04:28:55 +08:00
Strong Liu 5562a981ac HHH-7492 - fixing test failures caused by some configuration is not applied to metamodel 2012-07-31 15:02:52 +08:00
Strong Liu b6f068a1f0 HHH-7485 Collection Caching region is bindded with wrong default region in annotation side 2012-07-30 20:09:39 +08:00
Steve Ebersole b2ef3b67b2 HHH-7472 - Introduce a "schema management" service 2012-07-29 17:05:41 -05:00
Lukasz Antoniak 414e6111a8 HHH-6662, HHH-7445 - Fix and test 2012-07-25 23:23:17 +02:00
John Verhaeg 61fe3b7457 HHH-7474: Added support for new @FailureExpectedWithNewMetamodel annotation to be used by tests that still fail with the new metamodel. Functions exactly like @FailureExpected, except requires no JIRA key and is only processed when testing against the new metamodel. Also added annotation to several tests that were failing against the new metamodel, to get started with the process of annotating them all. 2012-07-25 15:00:55 -05:00
Strong Liu cd430fa869 HHH-7452 mixin interface to simplify orm xml binding 2012-07-25 23:18:47 +08:00
Strong Liu 787ab27d45 HHH-7452 mixin interface to simplify orm xml binding 2012-07-25 13:41:50 +08:00
Steve Ebersole 183c914f57 HHH-6204 - JoinColumn on non key field fails to populate collection 2012-07-24 14:59:27 -05:00
Hardy Ferentschik 58b5b7038b Formatting 2012-07-23 17:02:08 +02:00
Steve Ebersole 42a3061f3e Merge branch 'master' into metamodel
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/spi/NamedQueryDefinition.java
	hibernate-core/src/main/java/org/hibernate/internal/SQLQueryImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
	hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/AnnotationBindingContextImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/QueryProcessor.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/CompositePluralAttributeElementSourceImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/MappingDocument.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/TimestampAttributeSourceImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/VersionAttributeSourceImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EntityBindingContext.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/ComponentAttributeSourceImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingProcessor.java
	hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/Composite.java
	hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/BindingContext.java
	hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
	hibernate-core/src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/SimpleValueBindingTests.java
	hibernate-entitymanager/src/main/java/org/hibernate/ejb/AvailableSettings.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/event/CallbackResolver.java
2012-07-19 15:50:50 -05:00
Steve Ebersole ad2a9ef651 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : AttributeConverter 2012-07-18 17:00:20 -05:00
Strong Liu b95bcb31e6 HHH-7433 add jandex/classmate as a compile scope dependency to hibernate-testing module 2012-07-06 13:59:35 +08:00
Steve Ebersole 986b66eb18 Initial merge from master to metamodel 2012-06-07 16:12:32 -05:00
Strong Liu a203ea65aa HHH-7350 read-only entities can not be deleted from 2LC 2012-05-31 00:54:08 +08:00
Strong Liu 4b74517dcd HHH-7347 fail test if it runs longer than 30 minutes to prevent hangs 2012-05-23 22:11:46 +08:00
Bryan Varner 327002ab02 Adding a test case for HHH-7252. In this branch, the test case currently fails for PostgreSQL matrix tests, unless HHH-7251 is also applied. 2012-05-02 17:17:42 -05:00
Steve Ebersole a2bbe3cb53 HHH-7282 - Move org.hibernate.cache.internal.Timestamper to hibernate-testing module 2012-04-27 10:51:50 -05:00
Strong Liu b78fb983f8 use junit defined in libraries 2012-04-23 21:35:58 +08:00
Steve Ebersole 3cd58b6e79 HHH-7266 - Move away from use of Enhydra developed DataSource for JTA testing 2012-04-20 18:59:06 -05:00
Steve Ebersole 70847a2331 HHH-7266 - Move away from use of Enhydra developed DataSource for JTA testing 2012-04-20 17:08:53 -05:00
Lukasz Antoniak c7aa99d0d3 HHH-7187 - New Envers base test classes 2012-04-19 20:15:46 +08:00
Steve Ebersole 9c207b1128 HHH-7210 - Natural-id cache put stats not being correctly updated on insert for "asynch" cache providers 2012-03-30 12:02:25 -05:00
Steve Ebersole cf181b41b5 HHH-7199 - proper JTA and auto-commit interaction for envers testsuite 2012-03-26 20:09:18 -05:00
Strong Liu d3b640cb75 HHH-7197 reimport imports 2012-03-26 16:17:45 +08:00
Hardy Ferentschik 60c1b23c7b HHH-6271 Introducing Byteman in order to really test that a certain log message gets never called. 2012-03-19 23:19:46 +08:00
Strong Liu b51b2ff4cb HHH-7156 Make Hibernate ORM compile and run tests using JDK 7 (and JDK 6) 2012-03-13 21:58:48 +08:00
Steve Ebersole dceda48ff1 HHH-7162 - Use concise artifact syntax in build scripts 2012-03-09 13:40:26 -06:00
Steve Ebersole a889b6cca1 HHH-7097 - Entity load event doesn't result in naturalId->pk caching 2012-03-01 13:22:09 -06:00
Eric Dalquist c0b66d5298 HHH-7097 Cache naturalId mapping on load event 2012-02-21 11:15:21 -06:00
Steve Ebersole 383a130a9c HHH-7028 - Repackage org.hibernate.metamodel.source 2012-02-07 12:23:44 -06:00
Steve Ebersole be840465d3 HHH-7028 - Repackage org.hibernate.metamodel.source 2012-02-07 11:16:11 -06:00
Eric Dalquist 1569e6194b HHH-6974 Complete second level caching of natural id resolution 2012-02-07 08:34:23 -06:00
Eric Dalquist c473520585 HHH-6974 Class level naturalId cache and stats
Add class level @NaturalIdCache annotation to denote if second level natualId caching should be done
Flush out stats model for naturalId cache related stats
Add ehcache support classes for naturalId region
2012-02-07 08:34:23 -06:00
Eric Dalquist 72fe79a3f2 HHH-6974 Addition of NaturalIdRegion SPI
Adds NaturalIdRegion to RegionFactory
Adds creation of NaturalIdRegions to SessionFactoryImpl setup
Basic copy of collection cache region behavior for first pass at naturalId region support in ehcache
2012-02-07 08:34:23 -06:00
Steve Ebersole e75b8a77b1 HHH-6967 - HHH-6906 - Clean up javadoc warnings 2012-01-13 11:17:34 -06:00
Steve Ebersole 9ca985ccd1 HHH-6940 - Ability (easier) to run bits of code in a timeout protected way 2012-01-06 08:21:04 -06:00
Steve Ebersole 86f3f3c347 HHH-6940 - Ability (easier) to run bits of code in a timeout protected way 2012-01-05 16:38:19 -06:00
Strong Liu d7f3042e5b HHH-6851 DB2 doesn't support NotNullUnique causes org.hibernate.test.annotations.uniqueconstraint.UniqueConstraintTest.testUniquenessConstraintWithSuperclassProperty fail 2011-11-30 11:00:04 +08:00
Strong Liu ba764816b9 HHH-6827 correct testing 2L cache impl, mostly are copied from ehcache impl 2011-11-21 20:09:34 +08:00
Strong Liu 15a46a9661 HHH-6827 correct testing 2L cache impl, mostly are copied from ehcache impl 2011-11-21 20:09:15 +08:00
Strong Liu 8a800a1bc0 HHH-6827 correct timeout in BaseRegion 2011-11-21 20:04:41 +08:00
Strong Liu f8e347dabd HHH-6827 code format and javadoc, logging 2011-11-21 20:02:09 +08:00
renj c575f6e5f5 HHH-6807 skip this test for Sybase ASE 2011-11-14 13:08:13 +08:00
Strong Liu 70bd57bcff HHH-6792 connection leaks due to service registry is not destroyed 2011-11-02 17:37:05 +08:00
Strong Liu 27e9957f9e HHH-6773 test fails on sybase 2011-10-26 22:46:50 +08:00
John Verhaeg dfd718418c HHH-6765: Toggled reversed Boolean value returned from DialectChecks.SupportsExistsInSelectCheck.supportsExistsInSelect() 2011-10-24 14:49:13 -05:00
Strong Liu 98e68aab4b HHH-6742 move unit tests back to src/test 2011-10-18 21:47:19 +08:00
Steve Ebersole e14e47968f HHH-6683 - Consolidate (consistency) building of service registries 2011-09-27 12:45:07 -05:00
Steve Ebersole f4fa176255 HHH-6683 - Consolidate (consistency) building of service registries 2011-09-27 11:49:17 -05:00
Strong Liu bd54fe08f5 HHH-6677 skip @BeforeClassOnce / @AfterClassOnce if test is ignored 2011-09-27 01:00:49 +08:00
Steve Ebersole 9f214d8018 HHH-6640 - Add ability for Integrator to prepare ServiceRegistryBuilder and MetadataImplementor as part of lifecycle 2011-09-13 18:46:28 -05:00
Strong Liu e941eca2d5 HHH-6618 running hibernate functional test cases on DB matrix 2011-08-30 14:06:13 +08:00
Steve Ebersole c7ae4477ae HHH-6453 - Enable new metamodel in BaseCoreFunctionalTestCase 2011-07-20 18:16:24 -05:00
Gail Badner 2b8f4bad7c HHH-6453 : Enable new metamodel in BaseCoreFunctionalTestCase 2011-07-19 14:15:38 -07:00
Gail Badner ba56266dec HHH-6453 : Enable new metamodel in BaseCoreFunctionalTestCase 2011-07-19 10:59:55 -07:00
Steve Ebersole e339dac91e HHH-6371 - Develop metamodel binding creation using a push approach 2011-07-13 09:08:31 -05:00
Steve Ebersole 66bd796063 HHH-6371 - Develop metamodel binding creation using a push approach 2011-07-13 08:54:31 -05:00
Emmanuel Bernard 671a273e75 HHH-6406 Move JBoss Transaction dependency to 4.15.1 2011-07-06 22:49:10 +02:00
Hardy Ferentschik d1eec59c08 HHH-6381 Adding a actual assertion which tests the optional part. Also applying formatting styles. 2011-07-06 14:46:07 +02:00
Strong Liu 11f83b0373 HHH-6297 remove legacy cache api 2011-06-09 12:18:59 +08:00
Strong Liu 92ad3eed80 HHH-6297 remove legacy cache api 2011-06-09 12:18:59 +08:00
Steve Ebersole fb44ad936d HHH-6196 - Split org.hibernate.engine package into api/spi/internal 2011-05-04 17:15:47 -05:00
Steve Ebersole c930ebcd7d HHH-6191 - repackage org.hibernate.cache per api/spi/internal split 2011-05-04 14:43:04 -05:00
Steve Ebersole 85094bddbf HHH-6144 - Introduce ServiceRegistryBuilder 2011-04-23 16:12:37 -05:00
Steve Ebersole f07b88c75f HHH-6150 - JBoss AS7 integration work 2011-04-22 17:42:07 -05:00
Steve Ebersole 16e86687c9 HHH-6150 - JBoss AS7 integration work 2011-04-22 17:42:07 -05:00
Steve Ebersole 53e0439880 HHH-6144 - Introduce ServiceRegistryBuilder 2011-04-20 15:58:10 -05:00
Steve Ebersole 6504cb6d78 HHH-6098 - Slight naming changes in regards to new logging classes 2011-04-08 09:44:13 -05:00
Steve Ebersole 484d5e2fbb prepare 4.0.0.Alpha2 release 2011-04-06 16:28:39 -05:00
Steve Ebersole df9d8939bb HHH-2860 - Consolidate Session creation options/parameters 2011-03-31 15:22:01 -05:00
Steve Ebersole 3ff0288da5 HHH-5697 - Support for multi-tenancy 2011-03-25 18:31:04 -05:00
Steve Ebersole 815baf4348 HHH-6051 - Create a sessionfactory scoped ServiceRegistry 2011-03-24 22:18:38 -05:00
Steve Ebersole 731d00fd6d HHH-6047 - allow nesting of ServiceRegistry 2011-03-24 14:38:58 -05:00
JPAV 7767dfbc06 HHH-5615 Replaced slf4j references with jboss-logging for a few classes that fell through the cracks 2011-03-22 14:11:59 -05:00
Steve Ebersole 3402ba3a67 HHH-6028 - Remove o.h.classic.Session/Validatable 2011-03-19 08:16:33 -05:00
Steve Ebersole 0a908cb518 HHH-5942 - Migrate to JUnit 4 2011-03-17 18:30:33 -05:00
Steve Ebersole a4562f4da1 HHH-5942 - Migrate to JUnit 4 2011-03-17 18:30:33 -05:00
Steve Ebersole 718d56e267 HHH-6013 - Consolidate on single JTA impl for testing 2011-03-16 13:38:14 -05:00
Steve Ebersole df4df47b95 HHH-5942 - Migrate to JUnit 4 2011-03-14 13:14:07 -05:00
Steve Ebersole 20a120ef6c HHH-5942 - Migrate to JUnit 4 2011-03-14 13:14:07 -05:00
Steve Ebersole 1c203f35ec HHH-5942 - Migrate to JUnit 4 2011-03-14 13:14:07 -05:00
Steve Ebersole fd3fb8b316 HHH-5942 - Migrate to JUnit 4 2011-03-14 13:14:07 -05:00
Steve Ebersole 03ada52204 HHH-5942 - Migrate to JUnit 4 2011-03-14 13:14:06 -05:00