[hibernate-commits] [hibernate/hibernate-orm] c01dd4: HHH-5910 - Fix and test

GitHub noreply at github.com
Thu Dec 20 01:09:34 EST 2012


  Branch: refs/heads/metamodel
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: c01dd40a6566b62e3ae85f6c0024c147cf2d78ff
      https://github.com/hibernate/hibernate-orm/commit/c01dd40a6566b62e3ae85f6c0024c147cf2d78ff
  Author: Lukasz Antoniak <lukasz.antoniak at gmail.com>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

  Changed paths:
    M hibernate-envers/src/main/java/org/hibernate/envers/configuration/RevisionInfoConfiguration.java
    M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
    M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java
    M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/MetadataTools.java
    A hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java
    A hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java
    A hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java

  Log Message:
  -----------
  HHH-5910 - Fix and test


  Commit: 4b2871cfba53541d34a74a07b1fc588ce3eaaa51
      https://github.com/hibernate/hibernate-orm/commit/4b2871cfba53541d34a74a07b1fc588ce3eaaa51
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java
    M hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java
    M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
    M hibernate-core/src/main/java/org/hibernate/internal/SQLQueryImpl.java
    M hibernate-core/src/main/java/org/hibernate/internal/StoredProcedureOutputsImpl.java
    M hibernate-core/src/main/java/org/hibernate/loader/Loader.java
    M hibernate-core/src/main/java/org/hibernate/loader/collection/DynamicBatchingCollectionInitializerBuilder.java
    M hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java
    M hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java
    M hibernate-core/src/main/java/org/hibernate/loader/entity/DynamicBatchingEntityLoaderBuilder.java
    M hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java
    A hibernate-core/src/test/java/org/hibernate/test/locking/paging/Door.java
    A hibernate-core/src/test/java/org/hibernate/test/locking/paging/PagingAndLockingTest.java
    M hibernate-core/src/test/resources/hibernate.properties
    M hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/QueryImpl.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/lock/QueryLockingTest.java

  Log Message:
  -----------
  HHH-1168 - Problem combining locking and paging on Oracle


  Commit: 5d2f21a01e939ed0f76b123aa12d74dc6c33b26b
      https://github.com/hibernate/hibernate-orm/commit/5d2f21a01e939ed0f76b123aa12d74dc6c33b26b
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/hql/spi/TemporaryTableBulkIdStrategy.java

  Log Message:
  -----------
  HHH-7816 - DDL opertations will incorrectly commit current transaction on Oracle XA


  Commit: 8df655aa6b2bbaa4d0766f194de638b5fdcf9a89
      https://github.com/hibernate/hibernate-orm/commit/8df655aa6b2bbaa4d0766f194de638b5fdcf9a89
  Author: Brett Meyer <brmeyer at redhat.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/User.java
    M hibernate-core/src/test/java/org/hibernate/test/criterion/CriterionTest.java
    M hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/Child.java
    M hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java
    M hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/Parent.java
    M hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/ParentChild.hbm.xml

  Log Message:
  -----------
  HHH-7819 Correct test issues found in CI hibernate-core-master-matrix
job


  Commit: 0118819133897e5355a0415de72fb1e39dcc67c0
      https://github.com/hibernate/hibernate-orm/commit/0118819133897e5355a0415de72fb1e39dcc67c0
  Author: Brett Meyer <brmeyer at redhat.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Person.hbm.xml
    M hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/Mapping.hbm.xml
    M hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/Mapping.hbm.xml
    M hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/Person.hbm.xml
    M hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml
    M hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.hbm.xml
    M hibernate-core/src/test/java/org/hibernate/test/subclassfilter/union-subclass.hbm.xml
    M hibernate-core/src/test/java/org/hibernate/test/version/db/User.hbm.xml

  Log Message:
  -----------
  HHH-7819 Correct test issues found in CI hibernate-core-master-matrix
job


  Commit: 54760bb61e9f34a432c1e57d11ebe21918530ed4
      https://github.com/hibernate/hibernate-orm/commit/54760bb61e9f34a432c1e57d11ebe21918530ed4
  Author: Csaba Varga <csaboka at gmail.com>
  Date:   2012-11-22 (Thu, 22 Nov 2012)

  Changed paths:
    M hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/SimpleQuery.java

  Log Message:
  -----------
  HHH-7800: added unit test to demonstrate broken behavior ("between"
does not work inside an AuditDisjunction)


  Commit: ff25434d1f6d48b35d58cdb0305f11504c498d2c
      https://github.com/hibernate/hibernate-orm/commit/ff25434d1f6d48b35d58cdb0305f11504c498d2c
  Author: Csaba Varga <csaboka at gmail.com>
  Date:   2012-11-22 (Thu, 22 Nov 2012)

  Changed paths:
    M hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/BetweenAuditExpression.java

  Log Message:
  -----------
  HHH-7800: Fixed "between" doesn't work inside a disjunction issue


  Commit: cd3363151b77225458e37816f74c537cbc4798f6
      https://github.com/hibernate/hibernate-orm/commit/cd3363151b77225458e37816f74c537cbc4798f6
  Author: Csaba Varga <csaboka at gmail.com>
  Date:   2012-11-22 (Thu, 22 Nov 2012)

  Changed paths:
    M hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java

  Log Message:
  -----------
  HHH-7800: added unit test to demonstrate broken behavior ("maximize"
does not work inside an AuditDisjunction)


  Commit: dadc43af23b1e8dd8623abc66a9ff6864993bc14
      https://github.com/hibernate/hibernate-orm/commit/dadc43af23b1e8dd8623abc66a9ff6864993bc14
  Author: Csaba Varga <csaboka at gmail.com>
  Date:   2012-11-22 (Thu, 22 Nov 2012)

  Changed paths:
    M hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java

  Log Message:
  -----------
  HHH-7800: Fixed "maximize" doesn't work inside a disjunction issue


  Commit: 468c58358edbf091e33642fa123ac3494d67738d
      https://github.com/hibernate/hibernate-orm/commit/468c58358edbf091e33642fa123ac3494d67738d
  Author: Lukasz Antoniak <lukasz.antoniak at gmail.com>
  Date:   2012-11-22 (Thu, 22 Nov 2012)

  Changed paths:
    M hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java
    M hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/SimpleQuery.java
    M hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/StoreDeletedData.java

  Log Message:
  -----------
  HHH-7800 - Tests cleanup


  Commit: 14d1c626a5b3e678535aa23f689cadb0a0c34fd9
      https://github.com/hibernate/hibernate-orm/commit/14d1c626a5b3e678535aa23f689cadb0a0c34fd9
  Author: Lukasz Antoniak <lukasz.antoniak at gmail.com>
  Date:   2012-11-24 (Sat, 24 Nov 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/mapping/Table.java
    M hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java
    M hibernate-core/src/test/java/org/hibernate/test/propertyref/import.sql
    A hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaGenerationTest.java

  Log Message:
  -----------
  HHH-7612 - Fix and test


  Commit: 4785d7eb2e63f6d692908e84e29f64fa62b9a1a1
      https://github.com/hibernate/hibernate-orm/commit/4785d7eb2e63f6d692908e84e29f64fa62b9a1a1
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/QueryImpl.java

  Log Message:
  -----------
  HHH-7233 - unmuck EntityManager#getSingleResult wrt auto-setting of max results


  Commit: dd280b8c27864be2699c0c1a427a70a6d9084d98
      https://github.com/hibernate/hibernate-orm/commit/dd280b8c27864be2699c0c1a427a70a6d9084d98
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M hibernate-core/src/test/java/org/hibernate/test/locking/paging/Door.java

  Log Message:
  -----------
  HHH-1168 - Problem combining locking and paging on Oracle


  Commit: caf2ee420c171ad23a4745a6777cf2694de72a5d
      https://github.com/hibernate/hibernate-orm/commit/caf2ee420c171ad23a4745a6777cf2694de72a5d
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java

  Log Message:
  -----------
  HHH-7825 - org.hibernate.type.descriptor.java.DataHelper is incompatible with FireBird JDBC


  Commit: 5707798b4b4a3a7b99fc47faf5575ec11be2c4e0
      https://github.com/hibernate/hibernate-orm/commit/5707798b4b4a3a7b99fc47faf5575ec11be2c4e0
  Author: Strong Liu <stliu at hibernate.org>
  Date:   2012-11-28 (Wed, 28 Nov 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/mapping/Table.java
    M hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java
    M hibernate-core/src/test/java/org/hibernate/test/propertyref/import.sql
    R hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaGenerationTest.java

  Log Message:
  -----------
  Revert "HHH-7612 - Fix and test"

This reverts commit 14d1c626a5b3e678535aa23f689cadb0a0c34fd9.


  Commit: 6e71a0907eba1a83ef50f3f6d4bf860c7df292e5
      https://github.com/hibernate/hibernate-orm/commit/6e71a0907eba1a83ef50f3f6d4bf860c7df292e5
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2012-11-29 (Thu, 29 Nov 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java
    M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
    M hibernate-core/src/main/java/org/hibernate/loader/Loader.java
    M hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java
    M hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java

  Log Message:
  -----------
  HHH-1168 - Problem combining locking and paging on Oracle


  Commit: 21ade0c798ed0fbb1444339af396325f324f94cb
      https://github.com/hibernate/hibernate-orm/commit/21ade0c798ed0fbb1444339af396325f324f94cb
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2012-11-30 (Fri, 30 Nov 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/LockOptions.java
    M hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
    M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
    M hibernate-core/src/main/java/org/hibernate/loader/Loader.java
    M hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java

  Log Message:
  -----------
  HHH-1168 - Problem combining locking and paging on Oracle


  Commit: 516577ea80b5b7ea72ead279bd804315f6faeb8d
      https://github.com/hibernate/hibernate-orm/commit/516577ea80b5b7ea72ead279bd804315f6faeb8d
  Author: Lukasz Antoniak <lukasz.antoniak at gmail.com>
  Date:   2012-12-05 (Wed, 05 Dec 2012)

  Changed paths:
    M hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java
    M hibernate-envers/src/main/java/org/hibernate/envers/tools/query/QueryBuilder.java
    M hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java

  Log Message:
  -----------
  HHH-7827 - Correlating aggregated and outer queries


  Commit: da32690828d59c489241701c4107cc22033b519a
      https://github.com/hibernate/hibernate-orm/commit/da32690828d59c489241701c4107cc22033b519a
  Author: Lukasz Antoniak <lukasz.antoniak at gmail.com>
  Date:   2012-12-05 (Wed, 05 Dec 2012)

  Changed paths:
    M documentation/src/main/docbook/devguide/en-US/Envers.xml
    M hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java
    M hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java

  Log Message:
  -----------
  HHH-7827 - Documentation


  Commit: 2fad160bd69df9ffa3b5b18272316a931692fdff
      https://github.com/hibernate/hibernate-orm/commit/2fad160bd69df9ffa3b5b18272316a931692fdff
  Author: brmeyer <brett at 3riverdev.com>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
    M hibernate-entitymanager/src/main/java/org/hibernate/jpa/packaging/internal/JarVisitorFactory.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/packaging/JarVisitorTest.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/packaging/PackagingTestCase.java
    A hibernate-entitymanager/src/test/resources/org/hibernate/jpa/test/packaging/empty.txt

  Log Message:
  -----------
  HHH-7835 Inefficient implementation of
JarVisitorFactory.getBytesFromInputStream


  Commit: 230dc55d80bbef019736cea338ca1febbfdb8b21
      https://github.com/hibernate/hibernate-orm/commit/230dc55d80bbef019736cea338ca1febbfdb8b21
  Author: brmeyer <brett at 3riverdev.com>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
    M hibernate-entitymanager/src/main/java/org/hibernate/jpa/packaging/internal/JarVisitorFactory.java

  Log Message:
  -----------
  HHH-7835 Inefficient implementation of
JarVisitorFactory.getBytesFromInputStream


  Commit: 1f690e7aa6a5f4511084aac9526fe3e6812f2632
      https://github.com/hibernate/hibernate-orm/commit/1f690e7aa6a5f4511084aac9526fe3e6812f2632
  Author: brmeyer <brett at 3riverdev.com>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/packaging/PackagingTestCase.java
    A hibernate-entitymanager/src/test/resources/org/hibernate/jpa/test/packaging/loremipsum.txt

  Log Message:
  -----------
  HHH-7835 Updated the largeJar test to be completely isolated


  Commit: 263a84154e974c3e8691d2d894af9f841f6f109c
      https://github.com/hibernate/hibernate-orm/commit/263a84154e974c3e8691d2d894af9f841f6f109c
  Author: brmeyer <brett at 3riverdev.com>
  Date:   2012-12-07 (Fri, 07 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java

  Log Message:
  -----------
  HHH-7840 org.hibernate.id.IncrementGenerator very slow


  Commit: 79cc807aae892826cbb0b2e119160e33081851ee
      https://github.com/hibernate/hibernate-orm/commit/79cc807aae892826cbb0b2e119160e33081851ee
  Author: brmeyer <brett at 3riverdev.com>
  Date:   2012-12-07 (Fri, 07 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java

  Log Message:
  -----------
  HHH-7839  Documentation bug at
SimpleNaturalIdLoadAccess.getReference(Object naturalIdValue)


  Commit: 18d10d6fde7c1cfe83ec94ee3f32dec24c7b01af
      https://github.com/hibernate/hibernate-orm/commit/18d10d6fde7c1cfe83ec94ee3f32dec24c7b01af
  Author: Barney <barney2k7 at gmail.com>
  Date:   2012-12-07 (Fri, 07 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/mapping/Table.java

  Log Message:
  -----------
  HHH-7826 - Generate 'unique' constraints in stable order


  Commit: 47ddaad98d4c04b7c3043c032d3eb7c6363a2750
      https://github.com/hibernate/hibernate-orm/commit/47ddaad98d4c04b7c3043c032d3eb7c6363a2750
  Author: Kamyar Sajjadi <kamyar.sajjadi at gmail.com>
  Date:   2012-12-07 (Fri, 07 Dec 2012)

  Changed paths:
    M documentation/src/main/docbook/devguide/en-US/extras/executeUpdate.java
    M documentation/src/main/docbook/devguide/en-US/extras/hql-insert.java
    M documentation/src/main/docbook/devguide/en-US/extras/hql_delete.java
    M documentation/src/main/docbook/devguide/en-US/extras/updating_version.java

  Log Message:
  -----------
  HHH-7813 - Fixed the mistakes in code examples. All the examples was in chapter 4 (Batch processing).


  Commit: d34e409f416fda98893c85ce6bb30feb88f000f9
      https://github.com/hibernate/hibernate-orm/commit/d34e409f416fda98893c85ce6bb30feb88f000f9
  Author: brmeyer <brett at 3riverdev.com>
  Date:   2012-12-07 (Fri, 07 Dec 2012)

  Changed paths:
    M documentation/src/main/docbook/devguide/en-US/Locking.xml

  Log Message:
  -----------
  HHH-7811 grammar error in devguide for HB


  Commit: afc49f435ffb6039205cad6a3e6a758ba950217d
      https://github.com/hibernate/hibernate-orm/commit/afc49f435ffb6039205cad6a3e6a758ba950217d
  Author: Shawn Clowater <Shawn.Clowater at entero.com>
  Date:   2012-12-07 (Fri, 07 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java

  Log Message:
  -----------
  Changed the error handling for LazyInitializationException to go through the throwLazyInitializationException method so that the collection role is reported.


  Commit: 02825e9fd66be189fd94a9fa1f40c9d852cfc6ae
      https://github.com/hibernate/hibernate-orm/commit/02825e9fd66be189fd94a9fa1f40c9d852cfc6ae
  Author: mgrenonville <mgrenonville at excilys.com>
  Date:   2012-12-10 (Mon, 10 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ComponentJoin.java
    A hibernate-core/src/test/java/org/hibernate/test/component/basic2/Component.java
    M hibernate-core/src/test/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java

  Log Message:
  -----------
  HHH-7849 Unable to join on an embedded field 


  Commit: c75b045adc3fc4ed908b2ed133646198d9aad5f7
      https://github.com/hibernate/hibernate-orm/commit/c75b045adc3fc4ed908b2ed133646198d9aad5f7
  Author: brmeyer <brett at 3riverdev.com>
  Date:   2012-12-10 (Mon, 10 Dec 2012)

  Changed paths:
    M hibernate-core/src/test/java/org/hibernate/test/component/basic2/Component.java
    M hibernate-core/src/test/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java

  Log Message:
  -----------
  HHH-7849 Formatting


  Commit: 598c6d3d25a5f2095ba18000509466c9e25343bd
      https://github.com/hibernate/hibernate-orm/commit/598c6d3d25a5f2095ba18000509466c9e25343bd
  Author: brmeyer <brett at 3riverdev.com>
  Date:   2012-12-10 (Mon, 10 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ComponentJoin.java
    M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IdentNode.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/components/ComponentCriteriaTest.java

  Log Message:
  -----------
  HHH-7849 Cleaner fix.  Added additional regression test.


  Commit: 8463057b85db928fe8d3aa0b4379bc5b0f255c71
      https://github.com/hibernate/hibernate-orm/commit/8463057b85db928fe8d3aa0b4379bc5b0f255c71
  Author: Scott Marlow <smarlow at redhat.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/BulkAccessorFactory.java

  Log Message:
  -----------
  HHH-7850 BulkAccessorFactory Java 7 verify error resolved by JASSIST-163 BulkAccessorFactory.java.diff2 patch from Shigeru Chiba.


  Commit: 58978a486f6d56697274c8a358e70b8925be0a62
      https://github.com/hibernate/hibernate-orm/commit/58978a486f6d56697274c8a358e70b8925be0a62
  Author: Dustin Schultz <dustin.schultz at utah.edu>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/FieldTransformer.java
    M hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/JavassistClassTransformer.java
    A hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/SimpleRelation.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/InstrumentedClassLoader.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/InterceptFieldClassFileTransformerTest.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/Simple.java

  Log Message:
  -----------
  HHH-7747 - Fixes CNFE regression for runtime field level class
enhancing. Also removes the usage of ClassPool.getDefault() and
creates a new ClassPool on each usage.

HHH-7747 - Add the entity class to the ClassPool to support modular
classloading like OSGI. Remove unused import in FieldTransformer.

HHH-7747 - Enhanced test to ensure that class enhancement sees all
classes of an entity. Added test to ensure that StackMapTables are
non-null for Javassist added methods.


  Commit: d26730fb3f7f4db6814a27a1cece03d28933bfe7
      https://github.com/hibernate/hibernate-orm/commit/d26730fb3f7f4db6814a27a1cece03d28933bfe7
  Author: Scott Marlow <smarlow at redhat.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    R hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/SimpleRelation.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/InterceptFieldClassFileTransformerTest.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/Simple.java
    A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/SimpleRelation.java

  Log Message:
  -----------
  HHH-7850 minor test package changes


  Commit: b4e78a99e579114c5af6d1af1e62ab4f7fdb88d0
      https://github.com/hibernate/hibernate-orm/commit/b4e78a99e579114c5af6d1af1e62ab4f7fdb88d0
  Author: Scott Marlow <smarlow at redhat.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/FieldTransformer.java

  Log Message:
  -----------
  HHH-7747 check if the code attribute is null when building the StackMapTable


  Commit: c8aa47ba22218ba38360b27dca3e8c7cdd813e59
      https://github.com/hibernate/hibernate-orm/commit/c8aa47ba22218ba38360b27dca3e8c7cdd813e59
  Author: brmeyer <brett at 3riverdev.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M libraries.gradle

  Log Message:
  -----------
  HHH-7435 Performance bottleneck on Javassist


  Commit: 669ec5002f475bf1cb8ff00dad812112a0b3fe41
      https://github.com/hibernate/hibernate-orm/commit/669ec5002f475bf1cb8ff00dad812112a0b3fe41
  Author: Kamyar Sajjadi <kamyar.sajjadi at gmail.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M documentation/src/main/docbook/devguide/en-US/chapters/services/extras/register-event-listeners-example.java

  Log Message:
  -----------
  HHH-7029 - prependListeners changed to appendListeners in chapter 7.9.1. Integrator use-cases example


  Commit: c0011f1cc60504123a3856516a0a4f6e19cdf63f
      https://github.com/hibernate/hibernate-orm/commit/c0011f1cc60504123a3856516a0a4f6e19cdf63f
  Author: Kamyar Sajjadi <kamyar.sajjadi at gmail.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M documentation/src/main/docbook/devguide/en-US/chapters/events/extras/AuditInterceptor.java
    M documentation/src/main/docbook/manual/en-US/content/events.xml

  Log Message:
  -----------
  HHH-5973 - Replaced , with + in AuditInterceptor.java and in events.xml


  Commit: 234c4915239589219a3896522d246b8f001ee074
      https://github.com/hibernate/hibernate-orm/commit/234c4915239589219a3896522d246b8f001ee074
  Author: Kamyar Sajjadi <kamyar.sajjadi at gmail.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M documentation/src/main/docbook/manual/en-US/content/association_mapping.xml

  Log Message:
  -----------
  HHH-4562 - Fixed the typo in chapter 7.3.1. Added bigint after personId


  Commit: dc3283f50a147f458bc2ca827530ff8455df325e
      https://github.com/hibernate/hibernate-orm/commit/dc3283f50a147f458bc2ca827530ff8455df325e
  Author: Brett Meyer <brmeyer at redhat.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/id/SequenceGenerator.java
    M hibernate-core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java
    M hibernate-core/src/main/java/org/hibernate/id/TableGenerator.java
    M hibernate-core/src/main/java/org/hibernate/id/TableHiLoGenerator.java
    R hibernate-core/src/test/java/org/hibernate/id/TableHiLoGeneratorTest.java

  Log Message:
  -----------
  HHH-7856 Deprecate TableHiLoGenerator and TableGenerator


  Commit: 2883cb85c37fbd6fd956f750fc8082aaa9be0fa1
      https://github.com/hibernate/hibernate-orm/commit/2883cb85c37fbd6fd956f750fc8082aaa9be0fa1
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java
    M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java

  Log Message:
  -----------
  HHH-7860 : Log a warning when embed-xml attribute is used in mappings


  Commit: 32e87656153f7b0da276b674ff24b1ba25fd195d
      https://github.com/hibernate/hibernate-orm/commit/32e87656153f7b0da276b674ff24b1ba25fd195d
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
    M hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java
    M hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java
    M hibernate-core/src/main/java/org/hibernate/type/ArrayType.java
    M hibernate-core/src/main/java/org/hibernate/type/AssociationType.java
    M hibernate-core/src/main/java/org/hibernate/type/BagType.java
    M hibernate-core/src/main/java/org/hibernate/type/CollectionType.java
    M hibernate-core/src/main/java/org/hibernate/type/CustomCollectionType.java
    M hibernate-core/src/main/java/org/hibernate/type/EntityType.java
    M hibernate-core/src/main/java/org/hibernate/type/IdentifierBagType.java
    M hibernate-core/src/main/java/org/hibernate/type/ListType.java
    M hibernate-core/src/main/java/org/hibernate/type/ManyToOneType.java
    M hibernate-core/src/main/java/org/hibernate/type/MapType.java
    M hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java
    M hibernate-core/src/main/java/org/hibernate/type/OrderedMapType.java
    M hibernate-core/src/main/java/org/hibernate/type/OrderedSetType.java
    M hibernate-core/src/main/java/org/hibernate/type/SetType.java
    M hibernate-core/src/main/java/org/hibernate/type/SortedMapType.java
    M hibernate-core/src/main/java/org/hibernate/type/SortedSetType.java
    M hibernate-core/src/main/java/org/hibernate/type/Type.java
    M hibernate-core/src/main/java/org/hibernate/type/TypeFactory.java

  Log Message:
  -----------
  HHH-7771 : Deprecate obsolete Type, AssociationType, and TypeFactory methods


  Commit: cb4e92a98d6e6cd3cf8ba23ba7b6b6f18f4f455f
      https://github.com/hibernate/hibernate-orm/commit/cb4e92a98d6e6cd3cf8ba23ba7b6b6f18f4f455f
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/mapping/Array.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Bag.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
    M hibernate-core/src/main/java/org/hibernate/mapping/IdentifierBag.java
    M hibernate-core/src/main/java/org/hibernate/mapping/List.java
    M hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Map.java
    M hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java
    M hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Set.java
    M hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/HibernateTypeResolver.java

  Log Message:
  -----------
  HHH-7771 : Deprecate obsolete Type, AssociationType, and TypeFactory methods


  Commit: 3a995f574dfa89682d4b70a23fd786dba8c859a6
      https://github.com/hibernate/hibernate-orm/commit/3a995f574dfa89682d4b70a23fd786dba8c859a6
  Author: Brett Meyer <brmeyer at redhat.com>
  Date:   2012-12-14 (Fri, 14 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Table.java
    M hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java
    M hibernate-core/src/main/java/org/hibernate/metamodel/relational/Table.java
    M hibernate-core/src/main/java/org/hibernate/metamodel/relational/UniqueKey.java

  Log Message:
  -----------
  HHH-7797 Block "unique" syntax on a column if a constraint can/will be
used


  Commit: 953aec40adaf5e172eb6c936df71395868732b5d
      https://github.com/hibernate/hibernate-orm/commit/953aec40adaf5e172eb6c936df71395868732b5d
  Author: brmeyer <brett at 3riverdev.com>
  Date:   2012-12-14 (Fri, 14 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
    A hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java
    A hibernate-core/src/main/java/org/hibernate/dialect/unique/UniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Table.java

  Log Message:
  -----------
  HHH-7797 UniqueDelegate & DefaultUniqueDelegate


  Commit: 4204f2c5fef24c87808b21c537011f25e26e3eb0
      https://github.com/hibernate/hibernate-orm/commit/4204f2c5fef24c87808b21c537011f25e26e3eb0
  Author: brmeyer <brett at 3riverdev.com>
  Date:   2012-12-14 (Fri, 14 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
    M hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/dialect/unique/UniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Table.java
    M hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java

  Log Message:
  -----------
  HHH-7797 Finished first take on UniqueDelegate and rolled into .cfg and
.mapping


  Commit: 7b05f4aed8845d4ccefce71eea438b81be10610e
      https://github.com/hibernate/hibernate-orm/commit/7b05f4aed8845d4ccefce71eea438b81be10610e
  Author: Brett Meyer <brmeyer at redhat.com>
  Date:   2012-12-14 (Fri, 14 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/dialect/unique/UniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java
    M hibernate-core/src/main/java/org/hibernate/metamodel/relational/Database.java
    M hibernate-core/src/main/java/org/hibernate/metamodel/relational/Table.java
    M hibernate-core/src/main/java/org/hibernate/metamodel/relational/UniqueKey.java

  Log Message:
  -----------
  HHH-7797 Initial attempt at using UniqueDelegate within metamodel


  Commit: 962d1e580dce2f36c5aef824d1439e79e878000c
      https://github.com/hibernate/hibernate-orm/commit/962d1e580dce2f36c5aef824d1439e79e878000c
  Author: brmeyer <brett at 3riverdev.com>
  Date:   2012-12-14 (Fri, 14 Dec 2012)

  Changed paths:
    M hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintTest.java
    A hibernate-core/src/test/java/org/hibernate/test/constraint/ConstraintTest.java
    M hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java

  Log Message:
  -----------
  HHH-7797 initial test case


  Commit: 49c8a8e4f07c00973ca8f98e8bdd05a7392991e5
      https://github.com/hibernate/hibernate-orm/commit/49c8a8e4f07c00973ca8f98e8bdd05a7392991e5
  Author: brmeyer <brett at 3riverdev.com>
  Date:   2012-12-14 (Fri, 14 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/dialect/Cache71Dialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/IngresDialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/SybaseASE15Dialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/TimesTenDialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/dialect/unique/UniqueDelegate.java
    M hibernate-core/src/test/java/org/hibernate/test/constraint/ConstraintTest.java

  Log Message:
  -----------
  HHH-7797 Finished auditing dialects.  Cleanup and javadocs.  Completed
uniqueness test.


  Commit: 9bec5d12ff248896d43abb15f8c8e097aafb6686
      https://github.com/hibernate/hibernate-orm/commit/9bec5d12ff248896d43abb15f8c8e097aafb6686
  Author: brmeyer <brett at 3riverdev.com>
  Date:   2012-12-14 (Fri, 14 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/dialect/unique/UniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Table.java
    M hibernate-core/src/main/java/org/hibernate/metamodel/relational/Table.java

  Log Message:
  -----------
  HHH-7797 minor refactoring


  Commit: b4e8c5a83bb1ef0c935e2b5f7242017ab19524e8
      https://github.com/hibernate/hibernate-orm/commit/b4e8c5a83bb1ef0c935e2b5f7242017ab19524e8
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2012-12-17 (Mon, 17 Dec 2012)

  Changed paths:
    A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/MergeWithTransientNonCascadedAssociationTest.java

  Log Message:
  -----------
  test asserting Hibernate handling of unclear jpa behavior wrt merging detached object with reference to transient object via non-cascaded association


  Commit: 41397f22d17d165dc03e291a81a172dcaed232d5
      https://github.com/hibernate/hibernate-orm/commit/41397f22d17d165dc03e291a81a172dcaed232d5
  Author: brmeyer <brett at 3riverdev.com>
  Date:   2012-12-17 (Mon, 17 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
    M hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
    A hibernate-core/src/main/java/org/hibernate/dialect/unique/DB2UniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/dialect/unique/UniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Index.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Table.java
    M hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java
    M hibernate-core/src/main/java/org/hibernate/metamodel/relational/Index.java
    M hibernate-core/src/main/java/org/hibernate/metamodel/relational/Table.java

  Log Message:
  -----------
  HHH-7797 Use unique indexes on nullable columns for DB2.  Correctly
handle @UniqueConstraint table annotations on second passes.


  Commit: 1d5bf1608e977dc861f4b6d4e299836fa0d23783
      https://github.com/hibernate/hibernate-orm/commit/1d5bf1608e977dc861f4b6d4e299836fa0d23783
  Author: brmeyer <brett at 3riverdev.com>
  Date:   2012-12-17 (Mon, 17 Dec 2012)

  Changed paths:
    M hibernate-core/src/test/java/org/hibernate/test/annotations/EntityTest.java

  Log Message:
  -----------
  HHH-7797 Corrected failing test that was exposed by src changes


  Commit: b0efdb4d1473f9c4d76dc6f208e3f2ee10cfe0af
      https://github.com/hibernate/hibernate-orm/commit/b0efdb4d1473f9c4d76dc6f208e3f2ee10cfe0af
  Author: Galder Zamarreño <galder at zamarreno.com>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java
    M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java
    R hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/ClassLoaderAwareCache.java
    M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java
    A hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/ClassLoaderAwareCache.java

  Log Message:
  -----------
  HHH-7871 Write cache should not using LOCAL flag

* Flags were not being applied in clustered environments because of
the use of classloader aware cache which was not forwarding them.


  Commit: 2ff69d24c423d3e95e65606f1c836c975dc2a7c9
      https://github.com/hibernate/hibernate-orm/commit/2ff69d24c423d3e95e65606f1c836c975dc2a7c9
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java
    M hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java
    A hibernate-core/src/main/java/org/hibernate/cache/spi/SharedCacheDelegate.java
    M hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntry.java
    A hibernate-core/src/main/java/org/hibernate/cache/spi/entry/ReferenceCacheEntryImpl.java
    A hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StandardCacheEntryImpl.java
    M hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java
    M hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCollectionCacheEntry.java
    M hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredMapCacheEntry.java
    M hibernate-core/src/main/java/org/hibernate/cache/spi/entry/UnstructuredCacheEntry.java
    M hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
    M hibernate-core/src/main/java/org/hibernate/cfg/Settings.java
    M hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
    M hibernate-core/src/main/java/org/hibernate/engine/internal/TwoPhaseLoad.java
    M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java
    M hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
    M hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
    M hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java
    A hibernate-core/src/test/java/org/hibernate/test/cache/ReferenceCacheTest.java
    M hibernate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyPersisterClassProvider.java
    M hibernate-core/src/test/java/org/hibernate/test/legacy/CustomPersister.java

  Log Message:
  -----------
  HHH-7872 - Improved L2 cache storage of "reference" data


  Commit: 9c3998dade2af4b73d7745fa6e6d2788bd7872ce
      https://github.com/hibernate/hibernate-orm/commit/9c3998dade2af4b73d7745fa6e6d2788bd7872ce
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    R hibernate-core/src/main/java/org/hibernate/cache/spi/SharedCacheDelegate.java

  Log Message:
  -----------
  HHH-7872 - Improved L2 cache storage of "reference" data


  Commit: 12c7ab93c377de74c3ef9f8baba05f19a9c63a51
      https://github.com/hibernate/hibernate-orm/commit/12c7ab93c377de74c3ef9f8baba05f19a9c63a51
  Author: Brett Meyer <brett at 3riverdev.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
    M hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/dialect/unique/UniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Table.java
    M hibernate-core/src/main/java/org/hibernate/metamodel/relational/Table.java
    M hibernate-core/src/test/java/org/hibernate/test/annotations/EntityTest.java

  Log Message:
  -----------
  HHH-7797 Simplified UniqueKey creation and corrected a couple of
@UniqueConstraint bugs.


  Commit: 0a17d4612a350785d6717c6bfd3f962a2b5d6752
      https://github.com/hibernate/hibernate-orm/commit/0a17d4612a350785d6717c6bfd3f962a2b5d6752
  Author: Brett Meyer <brett at 3riverdev.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/ejb3configuration/PersisterClassProviderTest.java

  Log Message:
  -----------
  HHH-7872 corrected compiling issue


  Commit: c33fdae56377a00e9a4105b13f8336f6c7cca982
      https://github.com/hibernate/hibernate-orm/commit/c33fdae56377a00e9a4105b13f8336f6c7cca982
  Author: Brett Meyer <brett at 3riverdev.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M documentation/src/main/docbook/devguide/en-US/Envers.xml
    M documentation/src/main/docbook/devguide/en-US/Locking.xml
    M documentation/src/main/docbook/devguide/en-US/chapters/events/extras/AuditInterceptor.java
    M documentation/src/main/docbook/devguide/en-US/chapters/services/extras/register-event-listeners-example.java
    M documentation/src/main/docbook/devguide/en-US/extras/executeUpdate.java
    M documentation/src/main/docbook/devguide/en-US/extras/hql-insert.java
    M documentation/src/main/docbook/devguide/en-US/extras/hql_delete.java
    M documentation/src/main/docbook/devguide/en-US/extras/updating_version.java
    M documentation/src/main/docbook/manual/en-US/content/association_mapping.xml
    M documentation/src/main/docbook/manual/en-US/content/events.xml
    M hibernate-core/src/main/java/org/hibernate/LockOptions.java
    M hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java
    M hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java
    M hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java
    M hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/BulkAccessorFactory.java
    M hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/FieldTransformer.java
    M hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/JavassistClassTransformer.java
    M hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntry.java
    A hibernate-core/src/main/java/org/hibernate/cache/spi/entry/ReferenceCacheEntryImpl.java
    A hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StandardCacheEntryImpl.java
    M hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java
    M hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCollectionCacheEntry.java
    M hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredMapCacheEntry.java
    M hibernate-core/src/main/java/org/hibernate/cache/spi/entry/UnstructuredCacheEntry.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/HbmBinder.java
    M hibernate-core/src/main/java/org/hibernate/cfg/Settings.java
    M hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
    M hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
    M hibernate-core/src/main/java/org/hibernate/dialect/Cache71Dialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/IngresDialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/SybaseASE15Dialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/TimesTenDialect.java
    A hibernate-core/src/main/java/org/hibernate/dialect/unique/DB2UniqueDelegate.java
    A hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java
    A hibernate-core/src/main/java/org/hibernate/dialect/unique/UniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/engine/internal/TwoPhaseLoad.java
    M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java
    M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IdentNode.java
    M hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java
    M hibernate-core/src/main/java/org/hibernate/hql/spi/TemporaryTableBulkIdStrategy.java
    M hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java
    M hibernate-core/src/main/java/org/hibernate/id/SequenceGenerator.java
    M hibernate-core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java
    M hibernate-core/src/main/java/org/hibernate/id/TableGenerator.java
    M hibernate-core/src/main/java/org/hibernate/id/TableHiLoGenerator.java
    M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
    M hibernate-core/src/main/java/org/hibernate/internal/SQLQueryImpl.java
    M hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
    M hibernate-core/src/main/java/org/hibernate/internal/StoredProcedureOutputsImpl.java
    M hibernate-core/src/main/java/org/hibernate/loader/Loader.java
    M hibernate-core/src/main/java/org/hibernate/loader/collection/DynamicBatchingCollectionInitializerBuilder.java
    M hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java
    M hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java
    M hibernate-core/src/main/java/org/hibernate/loader/entity/DynamicBatchingEntityLoaderBuilder.java
    M hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Array.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Bag.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
    M hibernate-core/src/main/java/org/hibernate/mapping/IdentifierBag.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Index.java
    M hibernate-core/src/main/java/org/hibernate/mapping/List.java
    M hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Map.java
    M hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java
    M hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Set.java
    M hibernate-core/src/main/java/org/hibernate/mapping/Table.java
    M hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java
    M hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java
    M hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Index.java
    M hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
    M hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java
    M hibernate-core/src/main/java/org/hibernate/type/ArrayType.java
    M hibernate-core/src/main/java/org/hibernate/type/AssociationType.java
    M hibernate-core/src/main/java/org/hibernate/type/BagType.java
    M hibernate-core/src/main/java/org/hibernate/type/CollectionType.java
    M hibernate-core/src/main/java/org/hibernate/type/CustomCollectionType.java
    M hibernate-core/src/main/java/org/hibernate/type/EntityType.java
    M hibernate-core/src/main/java/org/hibernate/type/IdentifierBagType.java
    M hibernate-core/src/main/java/org/hibernate/type/ListType.java
    M hibernate-core/src/main/java/org/hibernate/type/ManyToOneType.java
    M hibernate-core/src/main/java/org/hibernate/type/MapType.java
    M hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java
    M hibernate-core/src/main/java/org/hibernate/type/OrderedMapType.java
    M hibernate-core/src/main/java/org/hibernate/type/OrderedSetType.java
    M hibernate-core/src/main/java/org/hibernate/type/SetType.java
    M hibernate-core/src/main/java/org/hibernate/type/SortedMapType.java
    M hibernate-core/src/main/java/org/hibernate/type/SortedSetType.java
    M hibernate-core/src/main/java/org/hibernate/type/Type.java
    M hibernate-core/src/main/java/org/hibernate/type/TypeFactory.java
    M hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java
    R hibernate-core/src/test/java/org/hibernate/id/TableHiLoGeneratorTest.java
    M hibernate-core/src/test/java/org/hibernate/test/annotations/enumerated/mapkey/User.java
    M hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintTest.java
    A hibernate-core/src/test/java/org/hibernate/test/cache/ReferenceCacheTest.java
    M hibernate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyPersisterClassProvider.java
    A hibernate-core/src/test/java/org/hibernate/test/component/basic2/Component.java
    M hibernate-core/src/test/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java
    A hibernate-core/src/test/java/org/hibernate/test/constraint/ConstraintTest.java
    M hibernate-core/src/test/java/org/hibernate/test/criterion/CriterionTest.java
    M hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/Child.java
    M hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java
    M hibernate-core/src/test/java/org/hibernate/test/hqlfetchscroll/Parent.java
    M hibernate-core/src/test/java/org/hibernate/test/legacy/CustomPersister.java
    A hibernate-core/src/test/java/org/hibernate/test/locking/paging/Door.java
    A hibernate-core/src/test/java/org/hibernate/test/locking/paging/PagingAndLockingTest.java
    M hibernate-core/src/test/resources/hibernate.properties
    M hibernate-core/src/test/resources/org/hibernate/test/hqlfetchscroll/ParentChild.hbm.xml
    M hibernate-core/src/test/resources/org/hibernate/test/propertyref/basic/Person.hbm.xml
    M hibernate-core/src/test/resources/org/hibernate/test/propertyref/component/complete/Mapping.hbm.xml
    M hibernate-core/src/test/resources/org/hibernate/test/propertyref/component/partial/Mapping.hbm.xml
    M hibernate-core/src/test/resources/org/hibernate/test/propertyref/inheritence/discrim/Person.hbm.xml
    M hibernate-core/src/test/resources/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml
    M hibernate-core/src/test/resources/org/hibernate/test/readonly/DataPoint.hbm.xml
    M hibernate-core/src/test/resources/org/hibernate/test/subclassfilter/union-subclass.hbm.xml
    M hibernate-core/src/test/resources/org/hibernate/test/version/db/User.hbm.xml
    M hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/QueryImpl.java
    M hibernate-entitymanager/src/main/java/org/hibernate/jpa/packaging/internal/JarVisitorFactory.java
    A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/cascade/MergeWithTransientNonCascadedAssociationTest.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/components/ComponentCriteriaTest.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/ejb3configuration/PersisterClassProviderTest.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/InstrumentedClassLoader.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/InterceptFieldClassFileTransformerTest.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/Simple.java
    A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/instrument/SimpleRelation.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/lock/QueryLockingTest.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/packaging/JarVisitorTest.java
    M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/packaging/PackagingTestCase.java
    A hibernate-entitymanager/src/test/resources/org/hibernate/jpa/test/packaging/empty.txt
    A hibernate-entitymanager/src/test/resources/org/hibernate/jpa/test/packaging/loremipsum.txt
    M hibernate-envers/src/main/java/org/hibernate/envers/configuration/RevisionInfoConfiguration.java
    M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
    M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java
    M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/MetadataTools.java
    M hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java
    M hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/BetweenAuditExpression.java
    M hibernate-envers/src/main/java/org/hibernate/envers/tools/query/QueryBuilder.java
    A hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/abstractparent/AbstractEntity.java
    A hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/abstractparent/AuditedAbstractParentTest.java
    A hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/abstractparent/EffectiveEntity1.java
    M hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java
    M hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/SimpleQuery.java
    M hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/StoreDeletedData.java
    M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java
    M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java
    R hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/ClassLoaderAwareCache.java
    M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java
    A hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/ClassLoaderAwareCache.java
    M hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java
    M libraries.gradle

  Log Message:
  -----------
  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


  Commit: 160727eab4c5d9e7cbe9448f6605076b93ed55eb
      https://github.com/hibernate/hibernate-orm/commit/160727eab4c5d9e7cbe9448f6605076b93ed55eb
  Author: Brett Meyer <brett at 3riverdev.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
    M hibernate-core/src/main/java/org/hibernate/dialect/unique/DB2UniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/dialect/unique/UniqueDelegate.java
    M hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Table.java
    M hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/UniqueKey.java
    M hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaCreatorImpl.java
    M hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaDropperImpl.java
    M hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java
    R hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardUniqueKeyExporter.java
    M hibernate-core/src/test/java/org/hibernate/metamodel/spi/relational/AbstractConstraintNameTests.java
    M hibernate-core/src/test/java/org/hibernate/metamodel/spi/relational/UniqueKeyConstraintNameTests.java
    M hibernate-core/src/test/java/org/hibernate/test/constraint/ConstraintTest.java

  Log Message:
  -----------
  HHH-7797 Updated for 5.0 metamodel


  Commit: 44994c4c368abf590bb2ea3b2512cbd2ca550418
      https://github.com/hibernate/hibernate-orm/commit/44994c4c368abf590bb2ea3b2512cbd2ca550418
  Author: Brett Meyer <brett at 3riverdev.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
    M hibernate-core/src/test/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java

  Log Message:
  -----------
  Post master->metamodel merge issues


Compare: https://github.com/hibernate/hibernate-orm/compare/0d09b5e35f38...44994c4c368a


More information about the hibernate-commits mailing list