4391 Commits

Author SHA1 Message Date
Strong Liu
b939be3157 HHH-7549 HHH-7318 support on new metamodel 2012-09-11 19:50:22 +08:00
Strong Liu
8bd17070ff HHH-7556 - compile error in h-ehcache module due to package change 2012-09-11 10:12:59 +08:00
Steve Ebersole
ec16599411 HHH-7556 - Clean up packages 2012-09-10 15:46:11 -05:00
Steve Ebersole
563a0e4b7a missed files on last merge 2012-09-10 14:23:01 -05: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
Hardy Ferentschik
a4b57ca7fa HHH-7571 Formatting test classes and marking OptionalOneToOnePKJCTest/OptionalOneToOneMappedByTest with FailureExpectedForNewMetamodel, because Binder#bindSingularAttribute does throw a NotYeyImplemented exception for ONE_TO_ONE nature. 2012-09-10 12:57:43 +02:00
Hardy Ferentschik
e5b57d42e5 HHH-7571 Processing @JoinColumn(s) as part of @ElementCollection and @JoinTable 2012-09-10 12:55:01 +02:00
Steve Ebersole
7b486fc4a4 HHH-1658 - unexpected AST node on HQL UPDATE 2012-09-07 12:03:48 -05:00
Steve Ebersole
e9bd0afe81 HHH-1658 - unexpected AST node on HQL UPDATE 2012-09-07 12:01:41 -05:00
Hardy Ferentschik
9e8dc3017b HHH-7571 Adding test for @CollectionTable 2012-09-07 11:55:33 +02:00
Hardy Ferentschik
ebcc59f0a1 HHH-7571 Starting to process @JoinTable and @CollectionTable
Moving JoinColumn processing into association attribute
Making anonymous ExplicitHibernateTypeSource implementation its own class
2012-09-06 18:01:14 +02: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
John Hardin
7e0559ecdb HHH-7398 -- Added testTimeout() and modified AbstractBatchImpl.buildBatchStatement() accordingly. 2012-09-05 14:04:52 -05:00
brmeyer
8b632c214d HHH-4394 Added test case 2012-09-05 13:43:05 -05:00
brmeyer
42de7604f8 Fix for HHH-7545 was missing a session close -- caused exception in 3.3
backport.
2012-09-05 13:43:04 -05:00
brmeyer
7b04acd4f4 HHH-7569 Merging test changes to master that were made only in 4.1
branch
2012-09-05 12:53:56 -05:00
Steve Ebersole
6a48cccd5d HHH-7568 - Add JPA1.0 compound key compatability when orm descriptor file used to override annotations. 2012-09-05 12:34:03 -05:00
Jeremy Whiting
961caf770a HHH-7568 Added test case to check removal of compound key association items. Changed the detection of JoinColumns to work when orm/hbm xml is used. Added change to configure a property when JoinColumns annotation is used on entity definition. 2012-09-05 12:06:31 -05:00
Steve Ebersole
40574b9d8a HHH-1123 - Cannot put more than 1000 elements in a InExpression 2012-09-05 11:29:13 -05:00
brmeyer
970bd8679e HHH-1123 Cannot put more than 1000 elements in a InExpression 2012-09-05 11:29:13 -05:00
Hardy Ferentschik
d661c3823d HHH-7571 Adding failure expected annotations where needed 2012-09-05 16:29:53 +02:00
Shawn Clowater
6ac746fffc HHH-7308
Change the beforeCompletion() method of the TransactionObserver() to call the beforeTransactionCompletion() method regardless of whether or not the session is open like the afterCompletion() method does when calling the afterTransactionCompletion() and also cleaned up the log message around session having after transaction events as this sort of logging had been previously moved to the close() method of SessionImpl.
2012-09-05 09:23:24 -05:00
Hardy Ferentschik
d14d18e40b HHH-7571 Minimal implementation of @ElementCollection details to pass AnnotationBasicCollectionBindingTests 2012-09-05 14:59:35 +02:00
Strong Liu
4fe75d5a09 HHH-7371 Natural-id: ObjectNotFoundException when found entity is marked as deleted 2012-09-05 17:22:19 +08:00
Strong Liu
8fa530a247 HHH-7300 - TypeDefs won't be found depending of files read-order 2012-09-05 17:06:40 +08:00
Strong Liu
e9d00d4b35 Merge branches 'pb00067-patch-8' and 'master' 2012-09-05 14:46:02 +08:00
Guenther Demetz
a043701de7 HHH-7059 The DerbyDialect deprecation warning should appear no more,
when using one of the version-specific dialects
2012-09-05 14:45:41 +08:00
U-MateusPimenta\Mateus Pimenta
401d4902fd HHH-7518 2012-09-05 14:41:29 +08:00
nrodrigues
072e64d26a HHH-7532 - Override getForUpdateString with correct syntax 2012-09-05 14:29:25 +08:00
Dustin Schultz
e8b2695289 HHH-7544
Fixes java.lang.VerifyError by building StackMapTables at appropriate
places.
2012-09-05 11:40:13 +08:00
Steve Ebersole
4e22fb9044 HHH-7566 - Activating JOIN fetch profile involving self-referential associations causes StackOverflowError 2012-09-04 16:08:28 -05:00
Steve Ebersole
54f4335416 HHH-7203 - IdentityGenerator fails with JOINED Inheritance when inserting entity to PosgtreSQL 2012-09-04 15:00:48 -05:00
Steve Ebersole
4450b127b2 HHH-7567 - Better checking when @Enumerated involved 2012-09-04 12:17:34 -05:00
Steve Ebersole
076eccb7a2 HHH-5188 - Use provided enum type ordinal/string when reading 2012-09-03 22:06:23 -05:00
Strong Liu
fd6cacd6f4 HHH-7459 fixing org.hibernate.test.annotations.manytoone.referencedcolumnname.ManyToOneReferencedColumnNameTest, for now add a Failure expected annotation on it 2012-09-04 02:10:47 +08:00
Strong Liu
67e05c4467 HHH-7459 fixing org.hibernate.test.annotations.manytoone.referencedcolumnname.ManyToOneReferencedColumnNameTest, for now add a Failure expected annotation on it 2012-09-04 02:10:47 +08:00
Strong Liu
2a80caed2a HHH-7459 clean tests' import 2012-09-04 02:10:46 +08:00
Strong Liu
2a3e50b400 HHH-7459 fixing fail tests 2012-09-04 02:10:46 +08:00
Strong Liu
68491e57a9 HHH-7459 AnnotationUnidirectionalOneToManyBindingTests now pass 2012-09-04 02:10:46 +08:00
Strong Liu
94abb7ca0f HHH-7459 empty JoinColumnResolutionContext to make compiler happy 2012-09-04 02:10:46 +08:00
Strong Liu
1b69d460b3 HHH-7549 @OneToMany support 2012-09-04 02:10:46 +08:00
Strong Liu
550f19f3da HHH-7549 Simple refactor 2012-09-04 02:10:45 +08:00
Strong Liu
1f80861b16 HHH-7549 change AbstractUnidirectionalOneToManyBindingTests test to have same mapping on hbm and ann 2012-09-04 02:10:45 +08:00
Hardy Ferentschik
7ce0203155 Refactoring basic colletion binding test to run against hbm and annotations 2012-09-03 17:06:19 +02:00
Gail Badner
eab658429f HHH-7549 @OneToMany support 2012-08-31 18:53:22 -07:00
Steve Ebersole
ab64f5c3be HHH-7552 - New StrategySelectorService : initial auto-detection 2012-08-31 16:20:05 -05:00
Hardy Ferentschik
d7fdf278df HHH-7322 Refactoring of unidirectional one to many test to cater for hbm and annotations
Adding some error handling in Binder for the case that not all configuration sources are added
Upgrading JBoss logging
2012-08-31 20:36:48 +02:00
Steve Ebersole
98ad44e75d HHH-7563 - Fallback for JBossAppServerJtaPlatform.locateUserTransaction() to look at "java:jboss" if "java:comp" not available 2012-08-31 11:22:07 -05:00
Didier Villevalois
8e30a2b86d HHH-7134 - Detection of wrong circularity when two tables with same name in different schemas
Fixes FKSecondPass processing to take catalog and schema in accounts. Corresponding test class is
org.hibernate.test.cfg.WrongCircularityDetectionTest.
2012-08-31 00:40:30 +08:00
Steve Ebersole
3e2be6a009 HHH-7557 - Map entries get deleted 2012-08-30 10:46:49 -05:00