Commit Graph

4195 Commits

Author SHA1 Message Date
Gail Badner ba459aa00c HHH-6569 : Update persisters and tuplizers to use components 2012-07-19 23:29:04 -07:00
Steve Ebersole 42a3061f3e Merge branch 'master' into metamodel
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/spi/NamedQueryDefinition.java
	hibernate-core/src/main/java/org/hibernate/internal/SQLQueryImpl.java
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
	hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/AnnotationBindingContextImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/QueryProcessor.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/CompositePluralAttributeElementSourceImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/MappingDocument.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/TimestampAttributeSourceImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/VersionAttributeSourceImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/entity/EntityBindingContext.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/ComponentAttributeSourceImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingProcessor.java
	hibernate-core/src/main/java/org/hibernate/metamodel/spi/domain/Composite.java
	hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/BindingContext.java
	hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
	hibernate-core/src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/SimpleValueBindingTests.java
	hibernate-entitymanager/src/main/java/org/hibernate/ejb/AvailableSettings.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/event/CallbackResolver.java
2012-07-19 15:50:50 -05:00
Steve Ebersole 6f1423a8e3 update master build SNAPSHOT target to 4.2 2012-07-19 08:56:31 -05:00
Steve Ebersole 693185a8ac Re-applying commit for HHH-6304 missed during rebase of JPA 2.1 branch with master due to JPA package refactoring 2012-07-18 18:19:47 -05:00
Steve Ebersole 30d8fdaa8b HHH-7451 - Integrate Draft 7 of the JPA 2.1 spec : more ejb->jpa rename 2012-07-18 18:05:06 -05:00
Steve Ebersole 06d44951c6 HHH-7451 - Integrate Draft 7 of the JPA 2.1 spec : more ejb->jpa rename 2012-07-18 17:48:59 -05:00
Steve Ebersole 6a65c3e7e6 HHH-7451 - Integrate Draft 7 of the JPA 2.1 spec : SynchronizationType 2012-07-18 17:48:59 -05:00
Steve Ebersole f8d06216e5 HHH-7451 - Integrate Draft 7 of the JPA 2.1 spec : criterias 2012-07-18 17:48:59 -05:00
Steve Ebersole 219707df1d HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : REF_CURSOR param handling 2012-07-18 17:48:59 -05:00
Steve Ebersole cb13cea1ac HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec + HEM boot cleanup (HHH-6159) 2012-07-18 17:48:59 -05:00
Steve Ebersole 9ce3afd8da HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : AttributeConverter + HEM boot cleanup (HHH-6159) 2012-07-18 17:03:09 -05:00
Steve Ebersole ad2a9ef651 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : AttributeConverter 2012-07-18 17:00:20 -05:00
Steve Ebersole 153eb4a913 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : stored procedure queries 2012-07-18 17:00:19 -05:00
Steve Ebersole 4174c14675 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : UPDATE/DELETE criterias 2012-07-18 16:52:33 -05:00
Steve Ebersole 2adab60d15 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : TREAT 2012-07-18 16:52:32 -05:00
Steve Ebersole 8b87ae8830 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : FUNCTION keyword 2012-07-18 16:52:32 -05:00
Steve Ebersole 0a37440431 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : ON keyword 2012-07-18 16:52:32 -05:00
Steve Ebersole 1dd3e3a0bc HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec 2012-07-18 16:52:32 -05:00
Steve Ebersole 3edb72db48 HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec : addNamedQuery support 2012-07-18 16:52:32 -05:00
Steve Ebersole 00059fee2f HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec 2012-07-18 16:48:45 -05:00
Scott Marlow b76e7c4987 HHH-7454 added DEBUG log message 'PersistenceUnitUtil#isLoaded is not always accurate; consider using EntityManager#contains instead' 2012-07-18 11:02:27 -04:00
Strong Liu f0a49ada75 HHH-7452 mixin interface to simplify orm xml binding 2012-07-17 15:26:45 +08:00
Strong Liu 6ed7e9ee7f HHH-7452 mix SchemaAware interface into orm.xml binding 2012-07-17 13:35:45 +08:00
Strong Liu 3806705b82 HHH-7450 reformat hibernate mapping xsd 2012-07-17 13:35:30 +08:00
Strong Liu 95a06fc49f HHH-7450 simplify xsd 2012-07-16 21:30:30 +08:00
Strong Liu d6ab4a203a HHH-7450 mapkey 2012-07-16 20:50:20 +08:00
Strong Liu f100b3de03 HHH-7450 component 2012-07-16 20:38:03 +08:00
Strong Liu 347398aad5 HHH-7450 fix test failure 2012-07-16 19:16:21 +08:00
Strong Liu f057bc8ac9 HHH-7450 meta-element 2012-07-16 18:55:46 +08:00
Strong Liu d57ffbdb32 HHH-7450 apply simplify plugin 2012-07-16 18:28:49 +08:00
Strong Liu 2eb320b9c6 HHH-7450 simplify composite-element-element 2012-07-16 17:25:29 +08:00
Strong Liu c1f7fd4d13 HHH-7450 simplify composite id's key-property and key-many-to-one property 2012-07-16 17:23:34 +08:00
Strong Liu de1d647a62 HHH-7450 add simplify plugin 2012-07-16 17:21:59 +08:00
Strong Liu 91a9e0f616 HHH-7450 add simplify plugin 2012-07-16 17:06:29 +08:00
Strong Liu 4e9bf24af1 HHH-7450 simplify hbm xsd 2012-07-16 17:01:44 +08:00
Strong Liu ef168c1f5d HHH-7448 hbm mapping xsd improve 2012-07-13 17:01:47 +08:00
Strong Liu ccc58c50ae prepare for 4.1.6 development 2012-07-13 01:06:17 +08:00
Strong Liu ab708a7ed9 HHH-2394 remove last comma in the array, seems some jdks do not support it 2012-07-12 23:55:17 +08:00
Strong Liu a4d83a9025 4.1.5.SP1 release 2012-07-12 23:37:15 +08:00
Strong Liu cef5f9a7cd HHH-2394 Add support for SqlFragmentAlias.entity element 2012-07-12 23:30:01 +08:00
Rob Worsnop 5cb8d3a8b3 HHH-2394 Add support for SqlFragmentAlias.entity element 2012-07-12 22:59:22 +08:00
Rob Worsnop 82c99ccf6f HHH-2394 Removed unused imports 2012-07-12 22:59:22 +08:00
Rob Worsnop 542bc5c83c HHH-2394 Allowed usage of {alias} marker. 2012-07-12 22:59:22 +08:00
Rob Worsnop 1cd8db2ac3 HHH-2394 Got filters working with secondary tables 2012-07-12 22:59:21 +08:00
Rob Worsnop 05dcc209ae HHH-2394 Implemented @SqlFragmentAlias 2012-07-12 22:58:11 +08:00
Rob Worsnop cfe7db063a consolidate src/test and src/matrix 2012-07-12 22:58:11 +08:00
Rob Worsnop dc4e87340d HHH-2394 refactored unit tests 2012-07-12 22:58:11 +08:00
Rob Worsnop 2aa89290f7 HHH-2394 Added test cases 2012-07-12 22:58:11 +08:00
Rob Worsnop 09547a9051 HHH-2394 Remove conditions that blocked filters on sub-classes (for annotations) 2012-07-12 22:58:10 +08:00
Rob Worsnop 63f2639101 HHH-2394 Derive table name from correct filter (fixed typo) 2012-07-12 22:58:10 +08:00