Commit Graph

257 Commits

Author SHA1 Message Date
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
Brett Meyer 394458f6a6 HHH-8010 Support app-managed EntityManagerFactory and SessionFactory
creation by OSGi bundles

Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
	hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java
	hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java
	hibernate-osgi/src/main/java/org/hibernate/osgi/HibernateBundleActivator.java
2013-02-28 10:28:23 -05:00
Brett Meyer 4d68ddf7b0 HHH-7991 Correct all instances of
Thread.currentThread().getContextClassLoader()
2013-02-14 10:44:36 -05:00
Brett Meyer 56867417e2 HHH-7527 Enterprise OSGi JPA support 2013-02-14 10:44:35 -05:00
Strong Liu d54a60448a HHH-7580 compile error
Conflicts:
	hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java
	hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/ClusterAwareRegionFactory.java
2013-01-29 13:58:58 -05:00
Steve Ebersole 7976e2396a HHH-7580 - Complete 2-phase SessionFactory building design
Conflicts:
	hibernate-core/src/main/java/org/hibernate/SessionFactory.java
	hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java
	hibernate-core/src/main/java/org/hibernate/metamodel/SessionFactoryBuilder.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/SessionFactoryBuilderImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbHelper.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataBuilderImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java
	hibernate-core/src/main/java/org/hibernate/service/spi/ServiceContributor.java
	hibernate-core/src/test/java/org/hibernate/cfg/beanvalidation/ApplySchemaConstraintTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicCollectionBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/AssertSourcesTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/BaseAnnotationBindingTestCase.java
	hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/OrmXmlParserTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/MetadataImplTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractBasicBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractUnsavedValueTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/JoinedSubclassBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/basiccollections/AbstractBasicCollectionBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/onetomany/AbstractUnidirectionalOneToManyBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/relational/AbstractGeneratedIdColumnTests.java
	hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/BatchingTest.java
	hibernate-core/src/test/java/org/hibernate/test/service/schema/internal/ExistingDatabaseMetaDataImplTest.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderUsingMetamodelImpl.java
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java
	hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
2013-01-29 13:58:58 -05:00
Strong Liu c1cf5cd6e6 HHH-7947 remove not maintained 2LC from doc 2013-01-28 13:30:38 +08:00
Strong Liu 6c6df69535 refactor, remove redundant type cast 2012-12-25 19:25:47 +08:00
Galder Zamarreño b0efdb4d14 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.
2012-12-18 09:44:45 +01:00
Galder Zamarreño 49ea5d65df HHH-7763 No need to clear caches when these are going to be stopped
* Make sure failures in stop won't affect other crucial stop operations
that could leave nodes unstopped.
2012-11-08 10:16:36 +01:00
Galder Zamarreño e57c822cbc HHH-7553 Use new Infinispan configuration exclusively 2012-10-26 17:46:05 +02:00
Galder Zamarreño cf9ef94f8e HHH-7553 Upgrade to Infinispan 5.2.0.Beta2 and fix testsuite 2012-10-26 17:46:03 +02:00
Galder Zamarreño d7e58c794d HHH-7554 Transform global statistics override to new configuration 2012-10-26 17:46:02 +02:00
Galder Zamarreño a074d3244d HHH-7640 Improve single node Infinispan 2LC performance
* Use an Infinispan cache to maintain pending puts, which avoids
the need to control it's memory consumption in the critical path
of putFromLoad.
* This cache is shared by all regions, and it's configured with
aggressive expiration settings to avoid piling up pending put
operations.
* Added a 2LC stress test that tests behaivour and performance
of 2LC under multiple situations, such as entity inserts, updates,
find via PK, find via query and deletes.
* Some other minor performance enhancements, such as avoiding
classloader aware cache wrapper if using 2LC locally.
* Remove cache adapter to reduce construction of useless objects.
* Cache flagged caches in order to avoid recomputing decorated
caches all the time, which reduces memory consumption.
* Skip locking for timestamp updates and separate timestamp region
implementations for local vs clustered scenarios.
2012-10-18 15:57:15 +02:00
Steve Ebersole ab64f5c3be HHH-7552 - New StrategySelectorService : initial auto-detection 2012-08-31 16:20:05 -05:00
Steve Ebersole 37542fe1f1 HHH-6823 - Short-name config values 2012-08-29 10:49:06 -05:00
Steve Ebersole 4ad49a02c9 HHH-7556 - Clean up packages 2012-08-28 14:12:15 -05:00
Strong Liu 7a82349f75 HHH-7385 change to use gradle 1.1 2012-08-08 17:09:11 +08:00
Strong Liu fe7a5d74c5 HHH-7350 read-only entities can not be deleted from 2LC 2012-05-31 00:54:08 +08:00
Strong Liu a203ea65aa HHH-7350 read-only entities can not be deleted from 2LC 2012-05-31 00:54:08 +08:00
andrigtmiller 27df736412 HHH-7350 - Fixed up the unit tests, to allow the lock of the cache region for an access strategy of READ_ONLY. 2012-05-31 00:54:07 +08:00
andrigtmiller 665798339d HHH-7350 - removed overridden methods in ReadOnlyAccess lock/unlock an instance and/or region of the cache, since inserts and deletes are allowed with a CacheConcurrencyStrategy of READ_ONLY. 2012-05-31 00:54:07 +08:00
Galder Zamarreño 61a8416463 ISPN-7350 Read only entities can be inserted and deleted 2012-05-25 10:29:47 +02:00
Galder Zamarreño 6417ffa1a4 HHH-7280 Upgrade to Infinispan 5.1.4.FINAL 2012-04-26 16:56:47 +02:00
Galder Zamarreño 55de90ec42 HHH-7256 Use minimalPuts in Infinispan
putFromLoad now checks for minimalPuts to verify whether the entry
is already present in the cache. By doing this, Hibernate stats
appear more precise since putForExternalReads that are no-op because
the cache already contains the entry are not counted as puts. This
avoids confusion amongst users. This should be reverted to checking
PFER's return value when https://issues.jboss.org/browse/ISPN-1986
has been implemented.
2012-04-17 19:50:37 +02:00
Galder Zamarreño a334b9f0af HHH-7238 Remove unneeded cache listeners 2012-04-13 18:09:51 +02:00
Scott Marlow 52d5d374e5 HHH-7179 QueryResultsRegionImpl needs the @Listener annotation (otherwise org.jboss.as.test.integration.jpa.secondlevelcache.JPA2LCTestCase will fail) 2012-04-03 11:05:51 -04:00
Galder Zamarreño 5fa28e87ea HHH-7179 Complete support for Natural Id caching for Infinispan 2012-04-02 11:10:36 +02:00
Strong Liu 2afa747ef9 HHH-7179 impl natural id region in hibernate-infinispan 2012-04-02 11:10:34 +02:00
Galder Zamarreño 9c55dde595 HHH-7204 Clear only regions created by the given region factory
Upgraded to Infinispan 5.1.3.FINAL too.
2012-03-28 20:39:11 +02:00
Strong Liu d3b640cb75 HHH-7197 reimport imports 2012-03-26 16:17:45 +08:00
Galder Zamarreño 41b9f2558f HHH-7176 Upgrade to Infinispan 5.1.2.FINAL 2012-03-15 12:52:12 +01:00
Galder Zamarreño 25487f2401 HHH-7166 Support multiple custom command factories 2012-03-15 12:51:48 +01:00
Strong Liu c943285bbd HHH-7156 Make Hibernate ORM compile and run tests using JDK 7 (and JDK 6) 2012-03-13 23:19:08 +08:00
Steve Ebersole dceda48ff1 HHH-7162 - Use concise artifact syntax in build scripts 2012-03-09 13:40:26 -06:00
Galder Zamarreño bc643ddb7c Increase concurrent write test timeout 2012-03-01 12:21:40 +01:00
Galder Zamarreño 8fccb62a6b HHH-7128 Upgrade to Infinispan 5.1.2.CR1 2012-02-29 18:41:34 +01:00
Galder Zamarreño 3449752493 HHH-7127 Fix query cache evictAll in single node 2012-02-29 17:58:56 +01: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
Strong Liu 6a22085e5b HHH-7206 upgrade to infinispan 5.1.1.FINAL 2012-02-06 18:06:11 -06:00
Galder Zamarreño 13c9dbfc21 HHH-7007 Evict all should work now in multi-region factory environments 2012-02-02 11:12:05 +01:00
Galder Zamarreño 5eee526234 HHH-1706 Support evictAll for LOCAL second level cache environments 2012-02-02 11:06:49 +01:00
Galder Zamarreño 4a323a4415 HHH-6980 Upgrade to Infinispan 5.1.0.CR4 2012-01-18 13:19:01 +00:00
Paul Ferraro 5a8060ae8b HHH-6952 Allow extensions of InfinispanRegionFactory to override classloader logic 2012-01-11 17:24:57 +01:00
Galder Zamarreño 8a4d604d9c ISPN-6955 Add guarantees that the cluster forms 2012-01-11 16:12:58 +01:00
Galder Zamarreño 81c505c70c HHH-6955 Use Infinispan's test JGroups stack that uses TEST_PING
By doing this, discovery of nodes is not timed and instead is done
in-memory which is much more reliable from a testing perspective.
Due to timing issues, some tests would randomly fail because the
cluster did not form in time, so changing to this JGroups stack for
testing solves random test failures due to invalidation messages
not being sent around.
2012-01-10 19:17:26 +01:00
Galder Zamarreño cc9fbf42a9 HHH-6955 Upgrade to Infinispan 5.1.0.CR3
* Switch to autoCommit=false so that unnecessary transactions
are not created.
* Mark timestamps cache explicitly non-transactional.
* Move away from using caches as a way to send evict all
notifications. Instead, use custom commands provided by Infinispan.
* Get rid of the JDBC transaction test because it does not make
sense configuring JDBC transactions with Infinispan 2LC.
2012-01-10 13:55:30 +01:00
Galder Zamarreño 6491724972 HHH-6729 Upgraded to Infinispan 5.1.0.CR1
* Made the configuration file explicitly define optimistic as locking
mode.
* Make sure a transaction manager that hooks to Hibernate's TM
is configured.
2011-12-08 16:16:44 +01: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 f8e347dabd HHH-6827 code format and javadoc, logging 2011-11-21 20:02:09 +08:00
Steve Ebersole d4e138eb13 HHH-6833 - Eable SQL logging for tests 2011-11-20 10:27:47 -06:00
Strong Liu 93f6ad6e2e HHH-6818 update dependencies management 2011-11-14 17:12:51 +08:00
Strong Liu 98e68aab4b HHH-6742 move unit tests back to src/test 2011-10-18 21:47:19 +08:00
Strong Liu 0f1d6c189b HHH-6626 ignore PutFromLoadValidatorUnitTestCase for now 2011-10-14 15:16:02 +08:00
Steve Ebersole f4fa176255 HHH-6683 - Consolidate (consistency) building of service registries 2011-09-27 11:49:17 -05:00
Galder Zamarreño 4a3a59047f HHH-6674 Upgraded to Infinispan 5.0.1.FINAL 2011-09-27 11:37:32 +02:00
Steve Ebersole 9f214d8018 HHH-6640 - Add ability for Integrator to prepare ServiceRegistryBuilder and MetadataImplementor as part of lifecycle 2011-09-13 18:46:28 -05:00
Sanne Grinovero d71a15d1c1 HHH-6626 Improve PutFromLoadValidatorUnitTestCase to be less timesensitive 2011-09-06 18:21:04 +02:00
Galder Zamarreño c678392e30 HHH-6219 Nullify pending put map or singleton to avoid leaks 2011-06-07 12:16:21 +02:00
Galder Zamarreño f78c79d676 HHH-6062 Infinispan now integrates as a synchronization
* A new property has been defined to control whether it hooks as a
synchronization or as an XA resource.
* Updated Infinispan to 5.0.0.CR4.
2011-06-07 10:22:05 +02:00
Galder Zamarreño f01505591d HHH-6186 Upgraded to latest Infinispan 5.0 CR 2011-05-17 13:59:56 +02:00
Steve Ebersole fb44ad936d HHH-6196 - Split org.hibernate.engine package into api/spi/internal 2011-05-04 17:15:47 -05: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 a6b8d62209 HHH-6094 - Test failures in hibernate-infinispan dealing with query caching 2011-05-03 14:33:51 -05:00
Steve Ebersole 16e86687c9 HHH-6150 - JBoss AS7 integration work 2011-04-22 17:42:07 -05:00
Steve Ebersole 53e0439880 HHH-6144 - Introduce ServiceRegistryBuilder 2011-04-20 15:58:10 -05: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 2a8c81790b HHH-6094 - Test failures in hibernate-infinispan dealing with query caching 2011-04-06 14:44:46 -05:00
Galder Zamarreño 634d9186a5 HHH-6015 - Fix classloader issue 2011-03-28 17:26:58 +02:00
Steve Ebersole 815baf4348 HHH-6051 - Create a sessionfactory scoped ServiceRegistry 2011-03-24 22:18:38 -05:00
Steve Ebersole 731d00fd6d HHH-6047 - allow nesting of ServiceRegistry 2011-03-24 14:38:58 -05:00
Steve Ebersole 3402ba3a67 HHH-6028 - Remove o.h.classic.Session/Validatable 2011-03-19 08:16:33 -05:00
Galder Zamarreño 5c8e4f195d HHH-6015 - Investigate hibernate-infinispan test failures
Some tests were relying on empty caches at the start, so
make sure these are clear.
2011-03-16 18:35:53 +01:00
Galder Zamarreño f3bab56382 HHH-6015 - hibernate-infinispan test failures after migration to JUnit4
Fixed isolated classloader test making sure the two classloaders
required are created, one with the classes and the other without them.
2011-03-15 14:12:01 +01:00
Steve Ebersole 1c203f35ec HHH-5942 - Migrate to JUnit 4 2011-03-14 13:14:07 -05:00
Steve Ebersole a6f8767a3c 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
Gail Badner 7c5f2ae5db HHH-5949 : Migrate, complete and integrate TransactionFactory as a service 2011-03-09 15:12:30 -08:00
JPAV 346418c4ef Final sync with upstream master 2011-03-08 16:19:57 -06:00
Steve Ebersole e1c03f28fd HHH-5949 - Migrate, complete and integrate TransactionFactory as a service 2011-03-07 10:48:32 -06:00
Steve Ebersole 0816d00e59 HHH-5986 - Refactor org.hibernate.util package for spi/internal split 2011-03-05 09:26:34 -06:00
Steve Ebersole 4d5b9f1ca1 HHH-5949 - Migrate, complete and integrate TransactionFactory as a service 2011-03-03 14:16:58 -06:00
Steve Ebersole b4a440e8d3 HHH-5949 - Migrate, complete and integrate TransactionFactory as a service 2011-03-02 16:52:43 -06:00
JPAV 79080f74d6 sync with master 2011-02-24 16:18:35 -06:00
Steve Ebersole 0c5526f724 HHH-5765 - Replaced ServiceRegistryHolder with ServiceRegistryBuilder 2011-02-23 16:27:31 -06:00
Steve Ebersole 11d32ba69c HHH-5943 - Make ServiceRegistry mutable 2011-02-23 15:48:02 -06:00
Galder Zamarreño 67606ca651 HHH-5859 - Upgraded to 4.2.0.CR1
Apart from upgrading Infinispan, test transaction manager code has been
changed so that read only transactions are not committed twice.
2011-02-23 15:20:00 -06:00
JPAV 19bc3ba7fc Modified infinispan module's build to exclude older version of jboss-logging library 2011-02-22 16:28:42 -06:00
Steve Ebersole 39d2d53968 HHH-5765 - Replaced ServiceRegistryHolder with ServiceRegistryBuilder 2011-02-21 23:41:17 -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
Steve Ebersole 011d7e1114 HHH-5903 - Rename ServicesRegistry to ServiceRegistry 2011-02-08 11:27:27 -06:00
Galder Zamarreño 5dfcdae14d HHH-5859 - Upgraded to 4.2.0.CR1
Apart from upgrading Infinispan, test transaction manager code has been
changed so that read only transactions are not committed twice.
2011-01-25 11:33:48 +01: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
Galder Zamarreño 04da27507e HHH-5793 - All put/remove calls should skip cache load and remote get 2011-01-12 15:14:21 +01:00
Galder Zamarreño 0a9e201a01 HHH-5793 - Apply skip cache load optimization to timestamp updates 2011-01-07 16:40:03 +01:00
Galder Zamarreño 863864fcce HHH-5793 - Query and timestamp caches to use cluster cache loader
Make evict put calls skip the cache loader since previous value is not
needed.
2010-12-20 11:11:52 +01:00
Galder Zamarreño b3aa9e0c28 HHH-5793 - Query and timestamp caches to use cluster cache loader
* Query and timestamp caches now use cluster cache loader instead of
state transfer in order to remain asynchronous.
* To maintain previous semantics, after query or timestamp regions have
been completely evicted, a check has been added to avoid going remote if
the region was invalid.
2010-12-15 19:30:56 +01:00
Galder Zamarreño f76555a993 HHH-5767 - Add running test information to Infinispan 2LC build 2010-12-03 14:54:57 +01:00
Gail Badner 91d444423b HHH-5765 : Wire in dialect factory and resolvers from service registry 2010-11-30 14:31:30 -08:00
Gail Badner 88543c7a58 HHH-5765 : Wire in connection provider from service registry 2010-11-30 11:38:53 -08:00
Galder Zamarreño 514b3a28c0 [HHH-5599] (NPE occurs when using Infinispan as L2 Cache) Protect against null cleaned and use conditional removes on pending puts 2010-10-19 09:32:49 +02:00
Galder Zamarreño 2de00decc6 [HHH-5669] (Fix gradle build issues with Infinispan 2LC) Fix several issues to get build and unit tests working. Upgraded to Infinispan 4.2.0.ALPHA3 as well. 2010-10-15 18:24:44 +02:00
Steve Ebersole 2443fede65 HHH-5616 - Switch to Gradle for builds .. incorrect .gitignore 2010-10-11 17:43:42 -05:00
Steve Ebersole 8beaccc7eb HHH-5616 - Switch to Gradle for builds .. infinispan 2010-10-11 14:41:49 -05:00