[hibernate/hibernate-orm] 7976e2: HHH-7580 - Complete 2-phase SessionFactory buildin...
by GitHub
Branch: refs/heads/master
Home: https://github.com/hibernate/hibernate-orm
Commit: 7976e2396a8ac09c12ff34a3dafdb89115763f0f
https://github.com/hibernate/hibernate-orm/commit/7976e2396a8ac09c12ff34a...
Author: Steve Ebersole <steve(a)hibernate.org>
Date: 2013-01-29 (Tue, 29 Jan 2013)
Changed paths:
M hibernate-core/src/main/java/org/hibernate/SessionFactory.java
M hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java
A hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistry.java
M hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java
M hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
M hibernate-core/src/main/java/org/hibernate/boot/registry/internal/StandardServiceRegistryImpl.java
M hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
M hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
M hibernate-core/src/main/java/org/hibernate/cfg/Environment.java
M hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java
M hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
M hibernate-core/src/main/java/org/hibernate/metamodel/Metadata.java
M hibernate-core/src/main/java/org/hibernate/metamodel/MetadataBuilder.java
M hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java
M hibernate-core/src/main/java/org/hibernate/metamodel/SessionFactoryBuilder.java
M hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbHelper.java
M hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataBuilderImpl.java
M hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java
M hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/SessionFactoryBuilderImpl.java
M hibernate-core/src/main/java/org/hibernate/service/ServiceRegistryBuilder.java
A hibernate-core/src/main/java/org/hibernate/service/spi/ServiceContributor.java
M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java
M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java
M hibernate-core/src/test/java/org/hibernate/metamodel/binding/AbstractBasicBindingTests.java
M hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicCollectionBindingTests.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/BaseAnnotationBindingTestCase.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/IdentifierGeneratorTest.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/MapsIdTest.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/global/FetchProfileBinderTest.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/global/QueryBinderTest.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/BaseAnnotationIndexTestCase.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/JandexHelperTest.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/OrmXmlParserTests.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/MetadataImplTest.java
M hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/SessionFactoryBuilderImplTest.java
M hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/EmbeddableIntegratorTest.java
M hibernate-core/src/test/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java
M hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/BatchingTest.java
M hibernate-core/src/test/java/org/hibernate/test/multitenancy/ConfigurationValidationTest.java
M hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/SchemaBasedMultiTenancyTest.java
M hibernate-core/src/test/java/org/hibernate/test/service/ServiceBootstrappingTest.java
A hibernate-core/src/test/java/org/hibernate/test/smoke/SessionFactoryBuildingUseCasesTest.java
M hibernate-core/src/test/java/org/hibernate/test/transaction/jdbc/TestExpectedUsage.java
M hibernate-core/src/test/java/org/hibernate/test/transaction/jta/BasicDrivingTest.java
M hibernate-core/src/test/java/org/hibernate/test/transaction/jta/ManagedDrivingTest.java
M hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java
M hibernate-testing/src/main/java/org/hibernate/testing/ServiceRegistryBuilder.java
M hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
Log Message:
-----------
HHH-7580 - Complete 2-phase SessionFactory building design
Conflicts:
hibernate-core/src/main/java/org/hibernate/SessionFactory.java
hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java
hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java
hibernate-core/src/main/java/org/hibernate/metamodel/SessionFactoryBuilder.java
hibernate-core/src/main/java/org/hibernate/metamodel/internal/SessionFactoryBuilderImpl.java
hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbHelper.java
hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataBuilderImpl.java
hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java
hibernate-core/src/main/java/org/hibernate/service/spi/ServiceContributor.java
hibernate-core/src/test/java/org/hibernate/cfg/beanvalidation/ApplySchemaConstraintTest.java
hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicCollectionBindingTests.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/AssertSourcesTest.java
hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/BaseAnnotationBindingTestCase.java
hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/OrmXmlParserTests.java
hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/MetadataImplTest.java
hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractBasicBindingTests.java
hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractUnsavedValueTests.java
hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/JoinedSubclassBindingTests.java
hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/basiccollections/AbstractBasicCollectionBindingTests.java
hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/onetomany/AbstractUnidirectionalOneToManyBindingTests.java
hibernate-core/src/test/java/org/hibernate/metamodel/spi/relational/AbstractGeneratedIdColumnTests.java
hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/BatchingTest.java
hibernate-core/src/test/java/org/hibernate/test/service/schema/internal/ExistingDatabaseMetaDataImplTest.java
hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderUsingMetamodelImpl.java
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java
hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
Commit: d54a60448a891288e4819aa28e4974c7a2c92db7
https://github.com/hibernate/hibernate-orm/commit/d54a60448a891288e4819aa...
Author: Strong Liu <stliu(a)hibernate.org>
Date: 2013-01-29 (Tue, 29 Jan 2013)
Changed paths:
M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java
M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/ClusterAwareRegionFactory.java
M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java
Log Message:
-----------
HHH-7580 compile error
Conflicts:
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/ClusterAwareRegionFactory.java
Commit: c52864d188a9ad38068e89989a1aba39794982c3
https://github.com/hibernate/hibernate-orm/commit/c52864d188a9ad38068e899...
Author: Brett Meyer <brett(a)3riverdev.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
Changed paths:
M hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java
R hibernate-core/src/test/java/org/hibernate/test/smoke/SessionFactoryBuildingUseCasesTest.java
Log Message:
-----------
HHH-7580 Corrected a few failures after the cherry-pick into master
Compare: https://github.com/hibernate/hibernate-orm/compare/c05238bad3cd...c52864d...
11 years, 2 months