dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15216
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-05-10 17:23:10 +0200
message:
  Hazelcast client config
modified:
  dhis-2/dhis-support/dhis-support-hibernate/pom.xml
  dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties
  dhis-2/pom.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/pom.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/pom.xml	2014-05-10 14:24:03 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/pom.xml	2014-05-10 15:23:10 +0000
@@ -39,7 +39,11 @@
     <dependency>
 	  <groupId>com.hazelcast</groupId>
 	  <artifactId>hazelcast-hibernate4</artifactId>
-    </dependency> 
+    </dependency>
+    <dependency>
+	  <groupId>com.hazelcast</groupId>
+	  <artifactId>hazelcast-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-entitymanager</artifactId>

=== 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 14:24:03 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties	2014-05-10 15:23:10 +0000
@@ -8,7 +8,7 @@
 #   1) The classpath (src/main/resources)
 #   2) $DHIS2_HOME
 
-# H2 In-Memory setup:
+# H2 In-Memory setup
 
 hibernate.dialect = org.hibernate.dialect.H2Dialect
 hibernate.connection.driver_class = org.h2.Driver
@@ -17,34 +17,37 @@
 hibernate.connection.password =
 hibernate.hbm2ddl.auto = create-drop
 
-# see c3p0-config.xml
-#hibernate.c3p0.min_size = 3
-#hibernate.c3p0.max_size = 20
-#hibernate.c3p0.acquire_increment = 2
-#hibernate.c3p0.timeout = 5000
-#hibernate.c3p0.max_statements = 50
-#hibernate.c3p0.idle_test_period = 300
+# See c3p0-config.xml
+# hibernate.c3p0.min_size = 3
+# hibernate.c3p0.max_size = 20
+# hibernate.c3p0.acquire_increment = 2
+# hibernate.c3p0.timeout = 5000
+# hibernate.c3p0.max_statements = 50
+# hibernate.c3p0.idle_test_period = 300
 
 # Caching
+
 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.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:
+# MySQL setup
 #
 # hibernate.dialect = org.hibernate.dialect.MySQLDialect
 # hibernate.connection.driver_class = com.mysql.jdbc.Driver
 # hibernate.connection.url = jdbc:mysql://localhost/dhis2?useUnicode=true&characterEncoding=UTF-8
 
-# PostgreSQL setup:
+# PostgreSQL setup
 #
 # hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
 # hibernate.connection.driver_class = org.postgresql.Driver

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2014-05-10 14:24:03 +0000
+++ dhis-2/pom.xml	2014-05-10 15:23:10 +0000
@@ -696,12 +696,17 @@
 	    <groupId>com.hazelcast</groupId>
 	    <artifactId>hazelcast</artifactId>
 	    <version>3.2.1</version>
-     </dependency>    
+      </dependency>    
       <dependency>
 	    <groupId>com.hazelcast</groupId>
 	    <artifactId>hazelcast-hibernate4</artifactId>
 	    <version>3.2.1</version>
-     </dependency>            
+      </dependency>   
+      <dependency> 
+        <groupId>com.hazelcast</groupId>
+        <artifactId>hazelcast-client</artifactId>
+        <version>3.2.1</version>
+      </dependency>         
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-entitymanager</artifactId>