Commit Graph

295 Commits

Author SHA1 Message Date
Steve Ebersole 7042790a53 HHH-7580 - Complete 2-phase SessionFactory building design 2012-09-12 15:48:20 -05:00
Steve Ebersole ec16599411 HHH-7556 - Clean up packages 2012-09-10 15:46:11 -05:00
Steve Ebersole 563a0e4b7a missed files on last merge 2012-09-10 14:23:01 -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
Steve Ebersole 110c3a4b92 HHH-7550 - Fix UP-TO-DATE checking for APT-based tasks 2012-08-24 20:39:53 -05:00
Steve Ebersole 63a2f0d7dc HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : CDI via reflection 2012-08-24 20:39:53 -05:00
Strong Liu 07d154fbf2 HHH-7514 fixing compile error 2012-08-23 23:02:51 +08:00
Strong Liu 8e8d681c7e Merge branch 'master' into metamodel 2012-08-23 22:54:33 +08:00
Steve Ebersole 581f037dee HHH-7514 - Upgrade to Jandex 1.1 2012-08-22 17:35:35 -05:00
Steve Ebersole fd8a45b2b2 HHH-7514 - Upgrade to Jandex 1.1 2012-08-22 13:41:16 -05: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
Steve Ebersole c9ff6f2fe2 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : CDI (small test change) 2012-08-17 18:31:13 -05:00
Steve Ebersole f74cf0b83f HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : CDI support 2012-08-17 18:20:03 -05:00
Steve Ebersole af4fedc98b HHH-7527 - OSGI manifests for hibernate-orm 2012-08-16 15:20:32 -05:00
Steve Ebersole 6b5a428b3f HHH-7527 - OSGI manifests for hibernate-orm : clean up org.hibernate.engine.spi package duplication between hem and core 2012-08-16 14:21:21 -05:00
Steve Ebersole 7120b85bbc HHH-7521 - JBoss 7 / JPA 2.1 integration work 2012-08-15 13:47:21 -05:00
Steve Ebersole b38e160cba HHH-7521 - JBoss 7 / JPA 2.1 integration work 2012-08-13 11:47:21 -05:00
Strong Liu 7a82349f75 HHH-7385 change to use gradle 1.1 2012-08-08 17:09:11 +08: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 127283374d HHH-7483 fix test failures caused by quoting table name 2012-07-30 12:58:15 +08:00
Steve Ebersole 183c914f57 HHH-6204 - JoinColumn on non key field fails to populate collection 2012-07-24 14:59:27 -05:00
Steve Ebersole 288155bcb2 HHH-6159 - Create EntityManagerFactoryBuilder : integrate EntityManagerFactoryBuilder with metamodel codebase 2012-07-24 02:30:40 -05:00
Steve Ebersole 61c04a0b30 HHH-6159 - Create EntityManagerFactoryBuilder : integrate EntityManagerFactoryBuilder with metamodel codebase 2012-07-24 00:03:29 -05: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 693185a8ac Re-applying commit for HHH-6304 missed during rebase of JPA 2.1 branch with master due to JPA package refactoring 2012-07-18 18:19:47 -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 06d44951c6 HHH-7451 - Integrate Draft 7 of the JPA 2.1 spec : more ejb->jpa rename 2012-07-18 17:48:59 -05:00
Steve Ebersole 6a65c3e7e6 HHH-7451 - Integrate Draft 7 of the JPA 2.1 spec : SynchronizationType 2012-07-18 17:48:59 -05:00
Steve Ebersole f8d06216e5 HHH-7451 - Integrate Draft 7 of the JPA 2.1 spec : criterias 2012-07-18 17:48:59 -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
Steve Ebersole 9ce3afd8da HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : AttributeConverter + HEM boot cleanup (HHH-6159) 2012-07-18 17:03:09 -05:00
Steve Ebersole 153eb4a913 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : stored procedure queries 2012-07-18 17:00:19 -05:00
Steve Ebersole 4174c14675 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : UPDATE/DELETE criterias 2012-07-18 16:52:33 -05:00
Steve Ebersole 2adab60d15 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : TREAT 2012-07-18 16:52:32 -05:00
Steve Ebersole 8b87ae8830 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : FUNCTION keyword 2012-07-18 16:52:32 -05:00
Steve Ebersole 0a37440431 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : ON keyword 2012-07-18 16:52:32 -05:00
Steve Ebersole 1dd3e3a0bc HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec 2012-07-18 16:52:32 -05:00
Steve Ebersole 3edb72db48 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : addNamedQuery support 2012-07-18 16:52:32 -05:00
Steve Ebersole 00059fee2f HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec 2012-07-18 16:48:45 -05:00
Scott Marlow b76e7c4987 HHH-7454 added DEBUG log message 'PersistenceUnitUtil#isLoaded is not always accurate; consider using EntityManager#contains instead' 2012-07-18 11:02:27 -04:00
Rob Worsnop dbff4c1839 HHH-2394 Got filters working on sub-classes. 2012-07-12 22:58:09 +08:00
Strong Liu 97ac8311d4 HHH-7426 Setting cacheable='true' in orm.xml does not enable caching of entity in 2lc 2012-07-12 15:00:44 +08:00
Strong Liu 973451d5e8 HHH-6304 HHH-6695 Error 'Cannot create TypedQuery for query with more than one return' with named queries 2012-07-12 11:53:27 +08:00
Steve Ebersole 7bdd8214e1 Merge branch 'master' into metamodel 2012-06-08 08:09:02 -05:00
Steve Ebersole 7cda27b6aa cleanup missed references to matrix sourceSet 2012-06-08 08:08:13 -05: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