Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,790 Commits 28 Branches 362 Tags 350 MiB
Commit Graph

324 Commits

Author SHA1 Message Date
Brett Meyer c33fdae563 Merge remote-tracking branch 'origin/master' into metamodel 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/LockOptions.java
	hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java
	hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCollectionCacheEntry.java
	hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredMapCacheEntry.java
	hibernate-core/src/main/java/org/hibernate/cache/spi/entry/UnstructuredCacheEntry.java
	hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
	hibernate-core/src/main/java/org/hibernate/id/TableGenerator.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/metamodel/relational/Database.java
	hibernate-core/src/main/java/org/hibernate/metamodel/relational/Table.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/HibernateTypeResolver.java
	hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Index.java
	hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/UniqueKey.java
	hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
	hibernate-core/src/main/java/org/hibernate/type/ArrayType.java
	hibernate-core/src/main/java/org/hibernate/type/Type.java
	hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintTest.java
	hibernate-core/src/test/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java
	hibernate-core/src/test/java/org/hibernate/test/criterion/CriterionTest.java
	hibernate-core/src/test/resources/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java
 2012-12-20 00:09:45 -05:00
Lukasz Antoniak da32690828 HHH-7827 - Documentation 2012-12-05 10:27:37 +01:00
Lukasz Antoniak 516577ea80 HHH-7827 - Correlating aggregated and outer queries 2012-12-05 10:27:35 +01:00
Lukasz Antoniak 468c58358e HHH-7800 - Tests cleanup 2012-11-22 12:02:35 +01:00
Csaba Varga dadc43af23 HHH-7800: Fixed "maximize" doesn't work inside a disjunction issue 2012-11-22 12:02:31 +01:00
Csaba Varga cd3363151b HHH-7800: added unit test to demonstrate broken behavior ("maximize" 
does not work inside an AuditDisjunction)
 2012-11-22 12:02:28 +01:00
Csaba Varga ff25434d1f HHH-7800: Fixed "between" doesn't work inside a disjunction issue 2012-11-22 12:02:24 +01:00
Csaba Varga 54760bb61e HHH-7800: added unit test to demonstrate broken behavior ("between" 
does not work inside an AuditDisjunction)
 2012-11-22 12:02:21 +01:00
Lukasz Antoniak c01dd40a65 HHH-5910 - Fix and test 2012-11-19 19:03:59 +01:00
Brett Meyer 18e44d1739 Merge branch master into metamodel 2012-11-15 15:01:13 -05:00
Lukasz Antoniak 5b004e4cbd HHH-7780 - Proper enumeration named/ordinal discovery 2012-11-14 16:15:43 +01:00
Lukasz Antoniak 97b1f0749e HHH-3854 - Fix and test 2012-11-11 17:58:23 +01:00
Lukasz Antoniak 0e3fe2b3d5 HHH-6349 - Test cleanup 2012-10-30 16:57:38 +01:00
Erik-Berndt Scheper 7b093fbc31 HHH-6349 Testcase: AuditJoinTable rows missing when detached entities with collections are merged into the persistence context 2012-10-30 16:57:36 +01:00
Erik-Berndt Scheper 47ae4e3ced HHH-6349 Testcase: AuditJoinTable rows missing when detached entities with collections are merged into the persistence context 2012-10-30 16:57:35 +01:00
Lukasz Antoniak 363048f44a HHH-7669 - Oracle sequences ordered 2012-10-30 08:48:28 +01:00
Lukasz Antoniak cbe619f9ba HHH-7727 - Mark Envers demo as test source 2012-10-28 22:13:14 +01:00
brmeyer b7855e944b HHH-7682 Audit records are not rolled back when transaction is rolled 
back
 2012-10-25 10:13:37 -04:00
Lukasz Antoniak ac511bf72e HHH-7690 - @EmbeddedId with @ManyToOne inside 2012-10-25 12:56:27 +02:00
brmeyer 1a00abc3a6 HHH-7669: JtaTransaction test fails on Oracle RAC 
https://hibernate.onjira.com/browse/HHH-7669
 2012-10-23 17:44:36 -04:00
Steve Ebersole 595f068977 HHH-7620 - allow ValidatorFactory to be passed into EntityManagerFactoryBuilder 2012-09-20 04:25:48 -05:00
brmeyer 69442c6ea7 HHH-7569 Correct test-only failures in hibernate-core-master-matrix CI 
job
 2012-09-18 07:13:20 -04:00
Steve Ebersole ec16599411 HHH-7556 - Clean up packages 2012-09-10 15:46:11 -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
Steve Ebersole 4ad49a02c9 HHH-7556 - Clean up packages 2012-08-28 14:12:15 -05:00
Lukasz Antoniak a9c28bf28f HHH-7543 - Fix and test 2012-08-24 22:30:37 +02:00
Lukasz Antoniak edfe8afaf1 HHH-7212 - Fix 2012-08-23 23:51:46 +02: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
Steve Ebersole 4282e23caa HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : CDI (small test change) 2012-08-18 12:30:21 -05:00
Lukasz Antoniak 773d0793f1 HHH-4751 - Fix and test 2012-08-16 10:34:16 +02:00
Strong Liu 7a82349f75 HHH-7385 change to use gradle 1.1 2012-08-08 17:09:11 +08:00
Lukasz Antoniak 9aa88b9a24 HHH-7157 - Fix and test 2012-08-07 19:07:56 +02:00
Strong Liu d0e13b664a HHH-7108 HHH-6608 2012-08-07 15:08:23 +08:00
Strong Liu 60aad81c23 HHH-7491 fix test failures caused by natural id cache access strategy is not exposed to the persister 2012-07-31 04:03:14 +08:00
Steve Ebersole 2d82a57632 HHH-7472 - Introduce a "schema management" service 2012-07-28 17:47:04 -05:00
John Verhaeg d7c4128826 HHH-7474: Added @FailureExpectedWithNewMetamodel annotation to all remaining tests that fail with the new metamodel, but still a couple of strange failures happening with some Envers tests. 2012-07-26 15:32:19 -05:00
Lukasz Antoniak 414e6111a8 HHH-6662, HHH-7445 - Fix and test 2012-07-25 23:23:17 +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 30d8fdaa8b HHH-7451 - Integrate Draft 7 of the JPA 2.1 spec : more ejb->jpa rename 2012-07-18 18:05:06 -05:00
Steve Ebersole cb13cea1ac HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec + HEM boot cleanup (HHH-6159) 2012-07-18 17:48:59 -05:00
Lukasz Antoniak ffa9cf5768 HHH-5565 - Fix and test 2012-06-17 15:26:11 +02:00
Steve Ebersole 159b81f680 Merge branch 'master' into metamodel 2012-06-08 08:01:46 -05:00
Steve Ebersole bd7b54a4ea cleanup missed references to matrix sourceSet 2012-06-08 07:59:54 -05:00
Steve Ebersole 986b66eb18 Initial merge from master to metamodel 2012-06-07 16:12:32 -05:00
Steve Ebersole b0bdda1141 consolidate src/test and src/matrix 2012-06-07 14:12:06 -05:00
Lukasz Antoniak 77d83b8a10 HHH-5411 - Fix and test 2012-06-07 14:08:15 +02:00
Lukasz Antoniak 8211c97ace HHH-7295 - Simplify ValidityAuditStrategy#perform() method 2012-05-30 18:49:40 +02:00
Steve Ebersole 06f0a13ee3 HHH-7295 - ParentAuditing Test in Envers Testsuite fails across different databases with different error messages because Hibernate does not set LockMode correctly 2012-05-30 08:55:20 -05:00
Steve Ebersole 835f4452eb HHH-7295 - ParentAuditing Test in Envers Testsuite fails across different databases with different error messages because Hibernate does not set LockMode correctly 2012-05-29 15:45:07 -05:00