=== modified 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	2014-05-10 14:40:09 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hazelcast.xml	2014-05-11 11:32:18 +0000
@@ -1,11 +1,33 @@
 <hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.2.xsd"
            xmlns="http://www.hazelcast.com/schema/config"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-           
+    <!--        
+    <group>
+        <name>dhis-hz-cluster</name>
+        <password>dhis-hz-cluster</password>
+    </group>
+    <network>
+        <port auto-increment="true" port-count="100">5701</port>
+        <outbound-ports>
+            <ports>0</ports>
+        </outbound-ports>
+        <join>
+            <multicast enabled="true">
+                <multicast-group>224.2.2.3</multicast-group>
+                <multicast-port>54327</multicast-port>
+            </multicast>
+            <tcp-ip enabled="false">
+                <interface>127.0.0.1</interface>
+            </tcp-ip>
+        </join>
+        <interfaces enabled="false">
+            <interface>10.10.1.*</interface>
+        </interfaces>
+    </network>
+    -->
 	<map name="default">
 		<time-to-live-seconds>720</time-to-live-seconds>
 		<max-size policy="PER_NODE">800000</max-size>
 		<eviction-policy>LRU</eviction-policy>
-	</map>
-	
+	</map>	
 </hazelcast>
\ 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-05-10 15:23:10 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties	2014-05-11 11:32:18 +0000
@@ -29,18 +29,9 @@
 
 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 = com.hazelcast.hibernate.HazelcastLocalCacheRegionFactory
 # hibernate.cache.region.factory_class = org.hibernate.cache.ehcache.EhCacheRegionFactory
 
-# Hazelcast clustering settings
-
-# hibernate.cache.use_minimal_puts = true
-# hibernate.cache.hazelcast.use_lite_member = true
-# hibernate.cache.hazelcast.use_native_client = true
-# hibernate.cache.hazelcast.native_client_address = 127.0.0.1
-# hibernate.cache.hazelcast.native_client_group = dhishz
-# hibernate.cache.hazelcast.native_client_password = dhishz
-
 # MySQL setup
 #
 # hibernate.dialect = org.hibernate.dialect.MySQLDialect