=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/pom.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/pom.xml 2014-04-22 15:46:19 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/pom.xml 2014-05-10 14:24:03 +0000
@@ -33,9 +33,13 @@
hibernate-core
- org.hibernate
- hibernate-ehcache
-
+ com.hazelcast
+ hazelcast
+
+
+ com.hazelcast
+ hazelcast-hibernate4
+
org.hibernate
hibernate-entitymanager
=== removed file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml 2014-04-08 19:36:25 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml 1970-01-01 00:00:00 +0000
@@ -1,385 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
=== added file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hazelcast.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hazelcast.xml 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hazelcast.xml 2014-05-10 14:24:03 +0000
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties 2014-04-28 19:23:37 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties 2014-05-10 14:24:03 +0000
@@ -26,14 +26,18 @@
#hibernate.c3p0.idle_test_period = 300
# Caching
-
-hibernate.cache.region.factory_class = org.hibernate.cache.ehcache.EhCacheRegionFactory
hibernate.cache.use_second_level_cache = true
hibernate.cache.use_query_cache = true
+hibernate.cache.region.factory_class = com.hazelcast.hibernate.HazelcastCacheRegionFactory
+#hibernate.cache.region.factory_class = org.hibernate.cache.ehcache.EhCacheRegionFactory
# hibernate.cache.region.factory_class = net.sf.ehcache.hibernate.EhCacheRegionFactory
# hibernate.cache.provider_class = org.hibernate.cache.EhCacheProvider
+# Caching cluster settings
+# hibernate.cache.use_minimal_puts = true
+# hibernate.cache.hazelcast.use_lite_member = true
+
# MySQL setup:
#
# hibernate.dialect = org.hibernate.dialect.MySQLDialect
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2014-04-29 12:04:04 +0000
+++ dhis-2/pom.xml 2014-05-10 14:24:03 +0000
@@ -693,10 +693,15 @@
${hibernate.version}
- org.hibernate
- hibernate-ehcache
- ${hibernate.version}
-
+ com.hazelcast
+ hazelcast
+ 3.2.1
+
+
+ com.hazelcast
+ hazelcast-hibernate4
+ 3.2.1
+
org.hibernate
hibernate-entitymanager