Permalink
Browse files

HHH-6297 remove legacy cache api

  • Loading branch information...
1 parent ad180ff commit 92ad3eed8080c63eb206665953cd050ba32373d5 @stliu stliu committed Jun 8, 2011
Showing with 1,934 additions and 3,966 deletions.
  1. +29 −7 documentation/src/main/docbook/manual/en-US/content/performance.xml
  2. +5 −7 etc/hibernate.properties
  3. +487 −488 etc/hibernate.properties.template
  4. +12 −14 hibernate-core/src/main/java/org/hibernate/MultiTenancyStrategy.java
  5. +0 −114 hibernate-core/src/main/java/org/hibernate/cache/internal/HashtableCache.java
  6. +0 −86 hibernate-core/src/main/java/org/hibernate/cache/internal/NoCacheProvider.java
  7. +14 −15 hibernate-core/src/main/java/org/hibernate/cache/internal/Timestamper.java
  8. +0 −114 ...rnate-core/src/main/java/org/hibernate/cache/internal/bridge/CollectionAccessStrategyAdapter.java
  9. +0 −81 hibernate-core/src/main/java/org/hibernate/cache/internal/bridge/CollectionRegionAdapter.java
  10. +0 −132 hibernate-core/src/main/java/org/hibernate/cache/internal/bridge/EntityAccessStrategyAdapter.java
  11. +0 −80 hibernate-core/src/main/java/org/hibernate/cache/internal/bridge/EntityRegionAdapter.java
  12. +0 −125 ...nate-core/src/main/java/org/hibernate/cache/internal/bridge/RegionFactoryCacheProviderBridge.java
  13. +0 −39 hibernate-core/src/main/java/org/hibernate/cache/internal/bridge/TimestampsRegionAdapter.java
  14. +0 −111 hibernate-core/src/main/java/org/hibernate/cache/spi/AbstractJndiBoundCacheProvider.java
  15. +0 −132 hibernate-core/src/main/java/org/hibernate/cache/spi/Cache.java
  16. +0 −197 hibernate-core/src/main/java/org/hibernate/cache/spi/CacheConcurrencyStrategy.java
  17. +0 −68 hibernate-core/src/main/java/org/hibernate/cache/spi/CacheProvider.java
  18. +0 −178 hibernate-core/src/main/java/org/hibernate/cache/spi/NonstrictReadWriteCache.java
  19. +0 −87 hibernate-core/src/main/java/org/hibernate/cache/spi/OptimisticCache.java
  20. +0 −165 hibernate-core/src/main/java/org/hibernate/cache/spi/ReadOnlyCache.java
  21. +0 −500 hibernate-core/src/main/java/org/hibernate/cache/spi/ReadWriteCache.java
  22. +1 −6 hibernate-core/src/main/java/org/hibernate/cache/spi/RegionFactory.java
  23. +0 −183 hibernate-core/src/main/java/org/hibernate/cache/spi/TransactionalCache.java
  24. +0 −33 hibernate-core/src/main/java/org/hibernate/cache/spi/access/EntityRegionAccessStrategy.java
  25. +0 −7 hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
  26. +0 −5 hibernate-core/src/main/java/org/hibernate/cfg/Environment.java
  27. +6 −6 hibernate-core/src/main/java/org/hibernate/cfg/ExternalSessionFactoryConfig.java
  28. +20 −34 hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
  29. +2 −2 hibernate-core/src/main/java/org/hibernate/jmx/HibernateServiceMBean.java
  30. +0 −159 hibernate-core/src/test/java/org/hibernate/test/legacy/CacheTest.java
  31. +2 −2 hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/SchemaBasedMultiTenancyTest.java
  32. +1 −1 hibernate-core/src/test/resources/hibernate.properties
  33. +1 −1 hibernate-core/src/test/resources/log4j.properties
  34. +0 −274 hibernate-ehcache/src/main/java/org/hibernate/cache/internal/EhCache.java
  35. +0 −171 hibernate-ehcache/src/main/java/org/hibernate/cache/internal/EhCacheProvider.java
  36. +0 −185 hibernate-ehcache/src/main/java/org/hibernate/cache/internal/SingletonEhCacheProvider.java
  37. +8 −8 hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionTest.java
  38. +5 −6 hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheTest.java
  39. +1 −1 ...-entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml
  40. +1 −1 hibernate-entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml
  41. +1 −1 hibernate-entitymanager/src/test/bundles/defaultpar_1_0/META-INF/persistence.xml
  42. +1 −1 hibernate-entitymanager/src/test/bundles/excludehbmpar/META-INF/persistence.xml
  43. +1 −1 hibernate-entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml
  44. +1 −1 hibernate-entitymanager/src/test/bundles/explodedpar/META-INF/persistence.xml
  45. +1 −1 hibernate-entitymanager/src/test/bundles/overridenpar/META-INF/persistence.xml
  46. +1 −1 hibernate-entitymanager/src/test/bundles/space par/META-INF/persistence.xml
  47. +1 −1 hibernate-entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml
  48. +1 −1 hibernate-entitymanager/src/test/resources/hibernate.properties
  49. +1 −1 hibernate-entitymanager/src/test/resources/org/hibernate/ejb/test/hibernate.cfg.xml
  50. +2 −2 ...e-envers/src/test/java/org/hibernate/envers/test/integration/cache/HibernateSecLvlQueryCache.java
  51. +360 −0 hibernate-testing/src/main/java/org/hibernate/testing/cache/AbstractReadWriteAccessStrategy.java
  52. +18 −21 ...bernate-testing/src/main/java/org/hibernate/testing/cache/BaseCollectionRegionAccessStrategy.java
  53. +85 −0 hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseEntityRegionAccessStrategy.java
  54. +91 −0 hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseGeneralDataRegion.java
  55. +34 −29 ...eRegionAdapter.java → hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseRegion.java
  56. +109 −0 hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseRegionAccessStrategy.java
  57. +14 −19 ...va → hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseTransactionalDataRegion.java
  58. +116 −0 hibernate-testing/src/main/java/org/hibernate/testing/cache/CachingRegionFactory.java
  59. +74 −0 hibernate-testing/src/main/java/org/hibernate/testing/cache/CollectionRegionImpl.java
  60. +78 −0 hibernate-testing/src/main/java/org/hibernate/testing/cache/EntityRegionImpl.java
  61. +17 −19 ...g/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteCollectionRegionAccessStrategy.java
  62. +22 −29 ...sting/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteEntityRegionAccessStrategy.java
  63. +59 −0 ...ate-testing/src/main/java/org/hibernate/testing/cache/ReadOnlyCollectionRegionAccessStrategy.java
  64. +86 −0 hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadOnlyEntityRegionAccessStrategy.java
  65. +36 −11 ...te-testing/src/main/java/org/hibernate/testing/cache/ReadWriteCollectionRegionAccessStrategy.java
  66. +127 −0 hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadWriteEntityRegionAccessStrategy.java
  67. +2 −2 hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
@@ -750,9 +750,9 @@ Customer customer = (Customer) session.get( Customer.class, customerId );
<tbody>
<row>
- <entry>Hashtable (not intended for production use)</entry>
+ <entry>ConcurrentHashMap (only for testing purpose, in hibernate-testing module)</entry>
- <entry><literal>org.hibernate.cache.internal.HashtableCacheProvider</literal></entry>
+ <entry><literal>org.hibernate.testing.cache.CachingRegionFactory</literal></entry>
<entry>memory</entry>
@@ -764,7 +764,7 @@ Customer customer = (Customer) session.get( Customer.class, customerId );
<row>
<entry>EHCache</entry>
- <entry><literal>org.hibernate.cache.internal.EhCacheProvider</literal></entry>
+ <entry><literal>org.hibernate.cache.internal.EhCacheRegionFactory</literal></entry>
<entry>memory, disk</entry>
@@ -773,7 +773,7 @@ Customer customer = (Customer) session.get( Customer.class, customerId );
<entry>yes</entry>
</row>
- <row>
+<!-- <row>
<entry>OSCache</entry>
<entry><literal>org.hibernate.cache.OSCacheProvider</literal></entry>
@@ -819,6 +819,17 @@ Customer customer = (Customer) session.get( Customer.class, customerId );
<entry>yes (replication or invalidation)</entry>
<entry>yes (clock sync req.)</entry>
+ </row> -->
+ <row>
+ <entry>Infinispan</entry>
+
+ <entry><literal>org.hibernate.cache.infinispan.InfinispanRegionFactory</literal></entry>
+
+ <entry>clustered (ip multicast), transactional</entry>
+
+ <entry>yes (replication or invalidation)</entry>
+
+ <entry>yes (clock sync req.)</entry>
</row>
</tbody>
</tgroup>
@@ -1114,7 +1125,7 @@ public SortedSet&lt;Ticket&gt; getTickets() {
<tbody>
<row>
- <entry>Hashtable (not intended for production use)</entry>
+ <entry>ConcurrentHashMap (not intended for production use)</entry>
<entry>yes</entry>
@@ -1134,10 +1145,10 @@ public SortedSet&lt;Ticket&gt; getTickets() {
<entry>yes</entry>
- <entry></entry>
+ <entry>yes</entry>
</row>
- <row>
+ <!-- <row>
<entry>OSCache</entry>
<entry>yes</entry>
@@ -1183,6 +1194,17 @@ public SortedSet&lt;Ticket&gt; getTickets() {
<entry></entry>
<entry>yes</entry>
+ </row> -->
+ <row>
+ <entry>Infinispan</entry>
+
+ <entry>yes</entry>
+
+ <entry></entry>
+
+ <entry></entry>
+
+ <entry>yes</entry>
</row>
</tbody>
</tgroup>
View
@@ -492,13 +492,11 @@ hibernate.cache.region_prefix hibernate.test
## choose a cache implementation
-#hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider
-#hibernate.cache.provider_class org.hibernate.cache.EmptyCacheProvider
-hibernate.cache.provider_class org.hibernate.cache.internal.HashtableCacheProvider
-#hibernate.cache.provider_class org.hibernate.cache.TreeCacheProvider
-#hibernate.cache.provider_class org.hibernate.cache.OSCacheProvider
-#hibernate.cache.provider_class org.hibernate.cache.SwarmCacheProvider
-
+#hibernate.cache.region.factory_class org.hibernate.cache.infinispan.InfinispanRegionFactory
+#hibernate.cache.region.factory_class org.hibernate.cache.infinispan.JndiInfinispanRegionFactory
+#hibernate.cache.region.factory_class org.hibernate.cache.internal.EhCacheRegionFactory
+#hibernate.cache.region.factory_class org.hibernate.cache.internal.SingletonEhCacheRegionFactory
+hibernate.cache.region.factory_class org.hibernate.cache.internal.NoCachingRegionFactory
## choose a custom query cache implementation
Oops, something went wrong.

0 comments on commit 92ad3ee

Please sign in to comment.