Strong Liu
f29a670378
merge master
2013-04-15 18:33:46 +08:00
Brett Meyer
cc4ef44670
HHH-8160 Updated for Gradle 1.5 OSGi plugin changes and package
...
versioning issues
2013-04-09 09:57:36 -04:00
Strong Liu
cb59c84389
merge master
2013-04-01 12:05:14 +08:00
Strong Liu
7881b4d6b6
resolve merge confilts
2013-03-18 20:12:26 +08:00
Brett Meyer
56867417e2
HHH-7527 Enterprise OSGi JPA support
2013-02-14 10:44:35 -05:00
Strong Liu
6c6df69535
refactor, remove redundant type cast
2012-12-25 19:25:47 +08:00
Strong Liu
11270a0f12
HHH-7549 fixing failing test
2012-09-13 14:24:16 +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
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
U-MateusPimenta\Mateus Pimenta
401d4902fd
HHH-7518
2012-09-05 14:41:29 +08:00
Steve Ebersole
ab64f5c3be
HHH-7552 - New StrategySelectorService : initial auto-detection
2012-08-31 16:20:05 -05:00
brmeyer
d4eade8199
HHH-7560 ehcache unit test intermittently failing
...
(UnknownServiceException)
2012-08-29 17:58:11 -04:00
Steve Ebersole
4ad49a02c9
HHH-7556 - Clean up packages
2012-08-28 14:12:15 -05:00
Strong Liu
8e8d681c7e
Merge branch 'master' into metamodel
2012-08-23 22:54:33 +08:00
Strong Liu
7a82349f75
HHH-7385 change to use gradle 1.1
2012-08-08 17:09:11 +08:00
Gail Badner
4ae8280e97
HHH-7497 : Remove @FailureExpectedWithNewMetamodel from tests that succeed without it
2012-08-01 16:11:36 -07:00
Strong Liu
7f3ad01b50
HHH-7495 HHH-7492 Move RegionFactory to session factory scope service registry
2012-08-01 04:28:55 +08:00
John Verhaeg
d7c4128826
HHH-7474: Added @FailureExpectedWithNewMetamodel annotation to all remaining tests that fail with the new metamodel, but still a couple of strange failures happening with some Envers tests.
2012-07-26 15:32:19 -05:00
Strong Liu
a203ea65aa
HHH-7350 read-only entities can not be deleted from 2LC
2012-05-31 00:54:08 +08:00
Strong Liu
d3b640cb75
HHH-7197 reimport imports
2012-03-26 16:17:45 +08:00
Steve Ebersole
dceda48ff1
HHH-7162 - Use concise artifact syntax in build scripts
2012-03-09 13:40:26 -06:00
Steve Ebersole
2f280b0c5a
Merge branch 'HHH-7096' of https://github.com/edalquist/hibernate-core
2012-03-01 13:32:45 -06:00
Eric Dalquist
fd6b3b4db4
HHH-7089 Return naturalId cache region instead of null
2012-03-01 10:25:10 -06:00
Eric Dalquist
a6ae52b732
HHH-7096 Populate Settings field in SingletonEhCacheRegionFactory
2012-02-21 11:07:31 -06:00
Eric Dalquist
1569e6194b
HHH-6974 Complete second level caching of natural id resolution
2012-02-07 08:34:23 -06:00
Eric Dalquist
c473520585
HHH-6974 Class level naturalId cache and stats
...
Add class level @NaturalIdCache annotation to denote if second level natualId caching should be done
Flush out stats model for naturalId cache related stats
Add ehcache support classes for naturalId region
2012-02-07 08:34:23 -06:00
Eric Dalquist
72fe79a3f2
HHH-6974 Addition of NaturalIdRegion SPI
...
Adds NaturalIdRegion to RegionFactory
Adds creation of NaturalIdRegions to SessionFactoryImpl setup
Basic copy of collection cache region behavior for first pass at naturalId region support in ehcache
2012-02-07 08:34:23 -06:00
Gail Badner
af3767b82a
HHH-6872 : Test failures with hibernate.jdbc.batch_versioned_data=true
2011-12-02 02:19:58 -08:00
Steve Ebersole
d4e138eb13
HHH-6833 - Eable SQL logging for tests
2011-11-20 10:27:47 -06:00
Strong Liu
a34c99a34c
HHH-6697 EntityManager.persist should through EntityExistsException instead of PersistenceException (from https://github.com/hibernate/hibernate-core/pull/178 )
2011-09-30 17:21:05 +08:00
Strong Liu
e655163c24
change ehcache disk location used for testing to avoid conflicts
2011-09-28 15:50:54 +08:00
Alex Snaps
3fe833456b
Check whether lock is null before logging, as it will probably be
2011-09-26 22:59:14 +08:00
Strong Liu
d0476de7f8
HHH-6451 adapt hibernate-ehcache to the new api
2011-07-19 01:51:02 +08:00
Alex Snaps
c26a23bf90
EHC-864 Moved all Hibernate dependent classes from ehcache-core to hibernate-ehcache module and fixed to use new API
2011-07-19 01:51:02 +08:00
Strong Liu
92ad3eed80
HHH-6297 remove legacy cache api
2011-06-09 12:18:59 +08:00
Strong Liu
4be53e9a22
HHH-6276 org.hibernate.test.cache.ehcache.EhCacheRegionFactoryImpl fails due to no slf4j in test configuration
2011-05-31 00:52:01 +08:00
Strong Liu
1ec6f9f793
HHH-6276 org.hibernate.test.cache.ehcache.EhCacheRegionFactoryImpl fails due to no slf4j in test configuration
2011-05-31 00:39:22 +08:00
Strong Liu
0f18069ecd
HHH-6276 org.hibernate.test.cache.ehcache.EhCacheRegionFactoryImpl fails due to no slf4j in test configuration
2011-05-31 00:25:53 +08:00
Steve Ebersole
66a641df05
HHH-6211 - Fix bad pull request merge
2011-05-09 10:07:41 -05:00
Steve Ebersole
6e71657331
HHH-6211 - Fix bad pull request merge
2011-05-09 10:07:41 -05:00
Greg Luck
53f8543911
Merge pull request #60 from alexsnaps/4.0
...
HHH-6083
2011-05-05 10:14:17 -07:00
Steve Ebersole
c930ebcd7d
HHH-6191 - repackage org.hibernate.cache per api/spi/internal split
2011-05-04 14:43:04 -05:00
Steve Ebersole
44cca7a375
HHH-6106 - Fix up IntelliJ project generation
2011-04-13 22:33:54 -05:00
Steve Ebersole
6504cb6d78
HHH-6098 - Slight naming changes in regards to new logging classes
2011-04-08 09:44:13 -05:00
Alex Snaps
8bd56a097a
Added tests for newly introduced RegionFactories and upgraded to 2.4.1 (2.3 is busted with Hibernate 4.0)
2011-04-05 17:46:57 +02:00
Steve Ebersole
7ece2ee52f
HHH-5942 - Migrate to JUnit 4
2011-03-25 10:54:03 -05:00
Steve Ebersole
5fb8b92eef
cleaned up erroneously committed bin/ directories
2011-03-14 13:38:58 -05:00
Steve Ebersole
20a120ef6c
HHH-5942 - Migrate to JUnit 4
2011-03-14 13:14:07 -05:00
Steve Ebersole
fd3fb8b316
HHH-5942 - Migrate to JUnit 4
2011-03-14 13:14:07 -05:00