Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,469 Commits 28 Branches 362 Tags 348 MiB
Commit Graph

54 Commits

Author SHA1 Message Date
Strong Liu cc6d271f31 merge master branch 2013-07-15 13:17:24 +08:00
Laurent RICHARD a300454a85 HHH-8302 init c3p0 initialPoolSize with minPoolSize 
Adding C3P0_STYLE_INITIAL_POOL_SIZE directly to c3props doesn't work
because of prefix "c3p0."
Using setOverwriteProperty checks for the nullability of the value and
removes this prefix
 2013-07-11 18:28:06 -04:00
Laurent RICHARD b968048485 HHH-8302 - add unit test 2013-07-11 18:25:51 -04:00
Strong Liu 96ce0d2742 merge master 2013-05-13 18:55:37 +08:00
Steve Ebersole 8e3770235b HHH-8211 - Checkstyle and FindBugs fix-ups 2013-05-09 19:51:10 -05:00
Strong Liu b9249e548a merge master 2013-05-06 22:55:00 +08:00
Steve Ebersole fdb30196fc HHH-8159 - Apply fixups indicated by analysis tools 2013-04-30 08:51:04 -05:00
Steve Ebersole bf781d4bf7 HHH-8159 - Apply fixups indicated by analysis tools 2013-04-30 08:36:27 -05:00
Steve Ebersole 9b37f2a297 HHH-8159 - Apply fixups indicated by analysis tools 2013-04-30 08:29:06 -05:00
Brett Meyer 0edd7b75b8 HHH-7943 C3P0 and Proxool OSGi support 2013-04-29 11:51:02 -04:00
Brett Meyer 398000517f HHH-7943 Reworked "Availability" concepts into "strategy registration 
providers".  Updated proxool and c3p0 to use strategy selection.
 2013-04-29 11:51:01 -04:00
Strong Liu a0ccbb425b merge master 2013-04-22 15:19:35 +08:00
Steve Ebersole 8eeef7af3b HHH-8146 - Update to use maven-publishing plugin 2013-04-16 18:26:02 -05:00
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 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
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 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
Hardy Ferentschik 952d8b230b HHH-7470 Removing obsolete @FailureExpectedWithNewMetamodel 2012-07-26 12:39:35 +02:00
John Verhaeg 61fe3b7457 HHH-7474: Added support for new @FailureExpectedWithNewMetamodel annotation to be used by tests that still fail with the new metamodel. Functions exactly like @FailureExpected, except requires no JIRA key and is only processed when testing against the new metamodel. Also added annotation to several tests that were failing against the new metamodel, to get started with the process of annotating them all. 2012-07-25 15:00:55 -05:00
Shawn Clowater b09e2729c0 HHH-7193 
Added clearBatch() to the releaseStatements() of AbstractBatchImpl in order to prevent batches from rolled back transactions being applied.

Added StatementCacheTest to illustrate the issue.

Added a validator dependency for c3p0 tests since I needed to have the batch semi aborted.
 2012-03-29 13:03:56 -05:00
Strong Liu d3b640cb75 HHH-7197 reimport imports 2012-03-26 16:17:45 +08:00
Steve Ebersole 87941b89aa HHH-7169 - Use ClassLoaderService to load JDBC driver classes 2012-03-13 14:51:04 -05:00
Steve Ebersole dceda48ff1 HHH-7162 - Use concise artifact syntax in build scripts 2012-03-09 13:40:26 -06:00
Gail Badner af3767b82a HHH-6872 : Test failures with hibernate.jdbc.batch_versioned_data=true 2011-12-02 02:19:58 -08:00
Strong Liu bec88716d6 HHH-6791 tiny improvement, in favor of java auto-box instead of create new instance 2011-11-02 14:16:02 +08:00
Strong Liu ed9c2bb61c HHH-6635 C3P0: hibernate.c3p0.* configuration properties not properly parsed 2011-09-07 20:19:06 +08:00
Strong Liu fcf43b2933 HHH-6635 C3P0: hibernate.c3p0.* configuration properties not properly parsed 2011-09-07 20:19:06 +08:00
Strong Liu e941eca2d5 HHH-6618 running hibernate functional test cases on DB matrix 2011-08-30 14:06:13 +08:00
Strong Liu a8ee266174 HHH-6327 NPE when using JDBC connection pool C3pO 2011-06-17 16:43:33 +08:00
Steve Ebersole 6504cb6d78 HHH-6098 - Slight naming changes in regards to new logging classes 2011-04-08 09:44:13 -05:00
Steve Ebersole 815baf4348 HHH-6051 - Create a sessionfactory scoped ServiceRegistry 2011-03-24 22:18:38 -05:00
Steve Ebersole 03ada52204 HHH-5942 - Migrate to JUnit 4 2011-03-14 13:14:06 -05:00
JPAV 346418c4ef Final sync with upstream master 2011-03-08 16:19:57 -06:00
Steve Ebersole 0816d00e59 HHH-5986 - Refactor org.hibernate.util package for spi/internal split 2011-03-05 09:26:34 -06:00
JPAV 094bfc4def Removed bin folders 2011-02-24 13:25:02 -06:00
JPAV c71e3c4baf Changed copyright notice from JBoss to Hibernate for new logging classes 2011-02-23 16:46:58 -06:00
Steve Ebersole 72a94161e2 HHH-5943 - Make ServiceRegistry mutable 2011-02-23 15:48:02 -06:00
Steve Ebersole 11d32ba69c HHH-5943 - Make ServiceRegistry mutable 2011-02-23 15:48:02 -06:00
Sanne Grinovero 2641842ba9 HHH-5843 - Avoid useless branches during HQL parsing when trace logging is disabled 2011-02-23 13:04:19 -06:00
Steve Ebersole 73ff2534e2 HHH-5943 - Make ServiceRegistry mutable 2011-02-21 19:19:20 -06:00
Steve Ebersole f53a6c708a HHH-5943 - Make ServiceRegistry mutable 2011-02-21 17:31:40 -06:00
JPAV ece77365dc Updated to work with latest releases of jboss-logging and jboss-logging-tools 2011-02-16 16:14:27 -06:00
JPAV 8c806d361d Changes from requests at Hibernate meeting: message codes, use XXXf methods for debug and trace, use @Cause 2011-02-08 13:55:27 -06:00
JPAV c26763c2e9 Added used of @Cause to log messages 2011-01-25 14:54:39 -06:00
JPAV af24178145 Give each project a single logger 2011-01-18 16:01:00 -06:00
JPAV 3712e1ad7e Give each project a single logger 2011-01-18 16:00:59 -06:00