Commit Graph

105 Commits

Author SHA1 Message Date
Brett Meyer 18e44d1739 Merge branch master into metamodel 2012-11-15 15:01:13 -05:00
Steve Ebersole 101b0fa212 HHH-7794 - Introduce JdbcTypeCodeNameMap 2012-11-13 10:27:04 -06:00
Strong Liu 064c355cd0 HHH-7706 some minor issues in the metamodel branch 2012-10-22 17:06:14 +08:00
brmeyer f3a8760d22 HHH-7666 Replace unit tests' use of configuration() 2012-10-03 17:07:44 -04:00
Guenther Demetz 7c218bbe11 HHH-7309 testcase 2012-09-19 08:25:37 -04:00
brmeyer 6660d2412a HHH-7569 Correct test-only failures in hibernate-core-master-matrix CI
job
2012-09-19 05:24:51 -04:00
John Verhaeg 57e4f3a9ea HHH-7602: Modified CustomRunner, BeforeClassCallbackHandler, and FailureExpectedHandler to handle exceptions in class methods. Marked tests appropriately with @FailureExpectedInNewMetamodel where necessary. 2012-09-14 17:58:26 -05:00
Steve Ebersole 7042790a53 HHH-7580 - Complete 2-phase SessionFactory building design 2012-09-12 15:48:20 -05:00
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