Commit Graph

568 Commits

Author SHA1 Message Date
Strong Liu 0e62ff4856 merge master 2013-08-03 23:10:54 +08:00
Lukasz Antoniak dd1bec53fb HHH-8280 - Identifiers reuse option 2013-08-01 13:13:39 +02:00
Brett Meyer 3102edba8b HHH-8399 corrected javassist in hibernate-osgi test 2013-07-31 14:42:12 -04:00
Brett Meyer 33b7e9f441 HHH-8388 Updated OSGi quickstarts and unit test for JPA 1.0.0.Final 2013-07-30 11:58:46 -04:00
Brett Meyer 076d064e3f HHH-8372 updated dependency versions 2013-07-23 14:56:28 -04:00
Strong Liu 3d562f81f2 Merge branch 'master' into m 2013-07-22 01:34:49 +08:00
Strong Liu a9978a7c85 simple doc typo 2013-07-16 12:22:20 +08:00
Strong Liu cda5d8e959 merge master 2013-06-17 22:47:03 +08:00
Lukasz Antoniak f2d435ddc1 HHH-8174 - Envers support for @NotFound 2013-06-11 09:08:56 -07:00
Brett Meyer d283a6fc77 HHH-8112 Added additional caveats to OSGi devguide 2013-06-07 11:19:37 -04:00
Brett Meyer e2922ca5f5 HHH-8265 Documented the reasoning for importing o.h.proxy and
javassist.util.proxy in the quickstarts.  Added a load proxy test.
2013-06-05 18:44:06 -04:00
Brett Meyer adcd61f0e1 HHH-8112 quickstart tutorial chapter 2013-06-03 16:15:23 -04:00
Brett Meyer ab11440331 HHH-8112 osgi devguide 2013-06-03 16:15:16 -04:00
Brett Meyer 51834421c5 HHH-8273 Incorrect "unique-key" naming comment in docs 2013-05-25 20:29:09 -04:00
Brett Meyer ad103b1c30 HHH-8112 added note about JPA 2.1 Aries fork 2013-05-21 19:55:02 -04:00
Brett Meyer f2073113fc HHH-8112 removed variables from POMs -- not supported by docbook 2013-05-21 18:06:28 -04:00
Brett Meyer 04c8e8c87a HHH-8112 OSGi quickstart tutorial projects 2013-05-21 15:17:16 -04:00
Strong Liu a0ccbb425b merge master 2013-04-22 15:19:35 +08:00
Strong Liu 3e160b9343 HHH-8186 Typo in docs, Caching section nonstrict != nontrict 2013-04-16 12:41:24 +08:00
Strong Liu f29a670378 merge master 2013-04-15 18:33:46 +08:00
Lukasz Antoniak f2b9ab8278 HHH-8171 - Cleanup 2013-04-14 22:27:05 +02:00
Kristoffer Lundberg 4796553a3f HHH-8171 - SETORDINAL to support set of embeddables 2013-04-14 22:27:03 +02:00
Steve Ebersole 54bc9fbf9d HHH-8163 - Deprecate @IndexColumn and add @ListIndexBase 2013-04-10 12:26:33 -05:00
Lukasz Antoniak 5cc051e1df HHH-7944 - Separation of Envers API, SPI and internal packages 2013-04-08 14:43:29 +02:00
Strong Liu cb59c84389 merge master 2013-04-01 12:05:14 +08:00
Strong Liu 1b05455d1e HHH-7667 docs 2013-03-28 11:32:06 +08:00
Strong Liu 06e3313f23 HHH-7746 - docs 2013-03-28 11:31:58 +08:00
Strong Liu 3c6f27a5dd HHH-7872 docs 2013-03-28 11:31:49 +08:00
Strong Liu 7881b4d6b6 resolve merge confilts 2013-03-18 20:12:26 +08:00
Strong Liu 89fd64bc2e HHH-7978 - Document new feature from HHH-5869 2013-03-13 14:42:26 +08:00
Sanne Grinovero e5f8039f31 HHH-8044 Remove mention of unsupported cache providers from documentation 2013-03-02 20:35:49 +00:00
Lukasz Antoniak 51a7df596e HHH-6613 - Support for audited @ElementCollection 2013-02-28 13:22:14 +01:00
Aleksander Blomskøld e0cfc6bf2e HHH-6736 Added support for SELECT ... FOR UPDATE SKIP LOCKED 2013-02-20 08:49:30 -06:00
Steve Ebersole 6599f710bb HHH-7965 - Redesign DialectResolver contract 2013-02-03 14:23:59 -06:00
Lukasz Antoniak 3bb0f246fc HHH-465 - Support for NULLS FIRST/LAST
Conflicts:
	hibernate-core/src/main/java/org/hibernate/cfg/Settings.java
	hibernate-core/src/main/java/org/hibernate/criterion/Order.java
2013-01-28 14:07:53 -05:00
Strong Liu c1cf5cd6e6 HHH-7947 remove not maintained 2LC from doc 2013-01-28 13:30:38 +08:00
Kamyar Sajjadi 80128705fb Changed the URL to maven.apache.org insted of maven.org 2013-01-24 13:16:25 -05:00
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
Kamyar Sajjadi 234c491523 HHH-4562 - Fixed the typo in chapter 7.3.1. Added bigint after personId 2012-12-12 10:47:23 -05:00
Kamyar Sajjadi c0011f1cc6 HHH-5973 - Replaced , with + in AuditInterceptor.java and in events.xml 2012-12-12 10:39:31 -05:00
Kamyar Sajjadi 669ec5002f HHH-7029 - prependListeners changed to appendListeners in chapter 7.9.1. Integrator use-cases example 2012-12-12 10:39:18 -05:00
brmeyer d34e409f41 HHH-7811 grammar error in devguide for HB 2012-12-07 12:12:49 -05:00
Kamyar Sajjadi 47ddaad98d HHH-7813 - Fixed the mistakes in code examples. All the examples was in chapter 4 (Batch processing). 2012-12-07 12:04:43 -05:00
Lukasz Antoniak da32690828 HHH-7827 - Documentation 2012-12-05 10:27:37 +01:00
Brett Meyer 18e44d1739 Merge branch master into metamodel 2012-11-15 15:01:13 -05:00
Steve Ebersole 1176477e6a HHH-7758 - Write fetching Developer Guide chapter on fetching 2012-11-06 00:38:56 -06: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 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