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
..
src	Merge branch 'master' into metamodel	2012-09-10 14:20:38 -05:00
hibernate-core.gradle	Merge branch 'master' into metamodel	2012-08-23 22:54:33 +08:00