dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15220
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-05-11 14:02:11 +0200
message:
  Hazelcast, sample tcp/ip config
modified:
  dhis-2/dhis-support/dhis-support-hibernate/pom.xml
  dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hazelcast.xml
  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 15:23:10 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/pom.xml	2014-05-11 12:02:11 +0000
@@ -41,10 +41,6 @@
 	  <artifactId>hazelcast-hibernate4</artifactId>
     </dependency>
     <dependency>
-	  <groupId>com.hazelcast</groupId>
-	  <artifactId>hazelcast-client</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-entitymanager</artifactId>
     </dependency>

=== 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-11 11:32:18 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hazelcast.xml	2014-05-11 12:02:11 +0000
@@ -1,7 +1,7 @@
 <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>
@@ -12,22 +12,19 @@
             <ports>0</ports>
         </outbound-ports>
         <join>
-            <multicast enabled="true">
+            <multicast enabled="false">
                 <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 enabled="true">
+                <member>127.0.0.1</member>
             </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/pom.xml'
--- dhis-2/pom.xml	2014-05-10 15:23:10 +0000
+++ dhis-2/pom.xml	2014-05-11 12:02:11 +0000
@@ -701,12 +701,7 @@
 	    <groupId>com.hazelcast</groupId>
 	    <artifactId>hazelcast-hibernate4</artifactId>
 	    <version>3.2.1</version>
-      </dependency>   
-      <dependency> 
-        <groupId>com.hazelcast</groupId>
-        <artifactId>hazelcast-client</artifactId>
-        <version>3.2.1</version>
-      </dependency>         
+      </dependency>    
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-entitymanager</artifactId>