Commit Graph

522 Commits

Author SHA1 Message Date
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 094c08cd08 HHH-7575 - Hibernate Getting Started Guide refers to incorrect tutorial directory for annotations tutoral 2012-09-06 08:41:37 -05:00
Steve Ebersole 37542fe1f1 HHH-6823 - Short-name config values 2012-08-29 10:49:06 -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
Steve Ebersole 5739392572 HHH-6823 - Short-name config values : transactions 2012-08-16 11:28:41 -05:00
Strong Liu 7a82349f75 HHH-7385 change to use gradle 1.1 2012-08-08 17:09:11 +08:00
Gail Badner 9a7d3ee81c HHH-7493 : Documentation still refers to dom4j as an entity mode 2012-08-08 00:32:35 -07:00
Hardy Ferentschik 0ad058f69f HHH-6315 Removing slf4j dependency and upgrading Validator version 2012-08-03 16:20:16 +02:00
Steve Ebersole 986b66eb18 Initial merge from master to metamodel 2012-06-07 16:12:32 -05:00
Martin Eisenhardt 886cf9157d Added missing word. 2012-06-05 12:23:14 +02:00
Martin Eisenhardt 95050f5d5a Fixed typo. 2012-06-04 11:59:23 +03:00
Strong Liu 99cd8455a1 HHH-7350 update the docs 2012-05-31 14:19:22 +08:00
Steve Ebersole 7ed87233a9 HHH-7306 - Allow use of CurrentTenantIdentifierResolver in normal session opening 2012-05-23 11:49:38 -05:00
Strong Liu d92e91bb4d HHH-7346 Tests fail on Postgresql due to failure in typecasts 2012-05-23 21:28:57 +08:00
Steve Ebersole a2a55d8ab6 HHH-7274 - Developer Guide reverses discussion of CMTTransactionFactory and JTATransactionFactory 2012-05-02 22:07:48 -05:00
Lukasz Antoniak cfa729d8b3 HHH-6790 - Sequence per entity for enhanced SequenceStyleGenerator 2012-04-21 12:32:42 +02:00
Lukasz Antoniak 95ec3457af HHH-7187 - Renaming and documenting enhanced revision entity 2012-04-19 23:49:41 +02:00
Strong Liu 5714a59e5e doc typo 2012-04-11 17:08:47 +08:00
Andre Azevedo 7ed63c282a Translating and correcting wrong white-spaces at the end of the string. 2012-04-10 16:50:38 +08:00
Baptiste Mathus 280751e118 transactionel -> transactionnel 2012-04-09 17:20:16 +08:00
Steve Ebersole 6193c73191 HHH-7221 - Document natural-id improvements as well as load-access APIs 2012-04-04 07:25:23 -05:00
Steve Ebersole 09538ec20d HHH-7221 - Document natural-id improvements as well as load-access APIs 2012-04-03 18:04:23 -05:00
Strong Liu d3b640cb75 HHH-7197 reimport imports 2012-03-26 16:17:45 +08:00
Strong Liu e4a82a0b6b HHH-7197 - update build scripts to not use deprecated gradle apis and change manual's xml declation to use doc namespace 2012-03-26 15:12:10 +08:00
Strong Liu 476fd2fca7 rollback org.jboss.pressgang: to 3.0.0 2012-03-15 22:04:57 +08:00
Strong Liu 2c85cbefa3 change org.jboss.pressgang:pressgang-jdocbook-style version to 3.0.1-SNAPSHOT, since there is no 3.0.0-SNAPSHOT available 2012-03-14 18:42:14 +08:00
Steve Ebersole 0e88fdd909 HHH-7153 - Update to newest jDocBook tool chain versions 2012-03-07 20:40:42 -06:00
Lukasz Antoniak 7c60f01f2d HHH-7106 - Fix, test and documentation 2012-03-03 10:27:35 +01:00
Steve Ebersole 7861fdee44 HHH-7067 - Update build to work with Gradle m8 2012-02-15 16:33:45 -06:00
Steve Ebersole 0e746d2723 HHH-7058 - Remove concept of org.hibernate.metamodel.spi.relational.Tuple 2012-02-13 13:06:34 -06:00
Steve Ebersole 383a130a9c HHH-7028 - Repackage org.hibernate.metamodel.source 2012-02-07 12:23:44 -06:00
Steve Ebersole be840465d3 HHH-7028 - Repackage org.hibernate.metamodel.source 2012-02-07 11:16:11 -06:00
Steve Ebersole 6702688c1f HHH-7011 - Document multi-tenancy 2012-02-07 08:14:58 -06:00
Steve Ebersole 40dc88e6c1 HHH-6082 - Incorporate EntityManager documentation into main dev guide 2012-02-07 00:29:42 -06:00
Steve Ebersole 30deb20ff1 HHH-6082 - Incorporate EntityManager documentation into main dev guide 2012-02-07 00:22:46 -06:00
Steve Ebersole 591364409e HHH-6082 - Incorporate EntityManager documentation into main dev guide 2012-02-07 00:22:46 -06:00
Steve Ebersole 102c31497b HHH-6082 - Incorporate EntityManager documentation into main dev guide 2012-02-07 00:22:46 -06:00
Steve Ebersole 8352ab39fb HHH-6082 - Incorporate EntityManager documentation into main dev guide 2012-02-07 00:22:45 -06:00
Steve Ebersole c4b7538ae3 HHH-6082 - Incorporate EntityManager documentation into main dev guide 2012-02-07 00:22:45 -06:00
Steve Ebersole c6fa7d3f23 HHH-6082 - Incorporate EntityManager documentation into main dev guide 2012-02-07 00:22:45 -06:00
Steve Ebersole 0e3cfbde55 HHH-6082 - Incorporate EntityManager documentation into main dev guide 2012-02-07 00:22:45 -06:00
Steve Ebersole 3cf41ee3dc HHH-6082 - Incorporate EntityManager documentation into main dev guide 2012-02-07 00:22:45 -06:00
Steve Ebersole 955f21eca9 HHH-6082 - Incorporate EntityManager documentation into main dev guide 2012-02-07 00:22:45 -06:00
Steve Ebersole 9b304942cc HHH-6082 - Integrate EntityManager documentation into dev guide 2012-02-07 00:22:45 -06:00
Steve Ebersole 2b356317ce HHH-7011 - Document multi-tenancy 2012-02-01 12:23:47 -06:00
Steve Ebersole feba0bf949 HHH-7011 - Document multi-tenancy 2012-02-01 12:22:06 -06:00
Steve Ebersole 8bead4f084 HHH-7011 - Document multi-tenancy 2012-01-31 19:59:37 -06:00
Steve Ebersole a2a1775c87 HHH-6656 - Document org.hibernate.service.classloading.spi.ClassLoaderService 2012-01-23 09:26:32 -06:00