cmailleux 2005/12/16 17:02:54 CET
Modified files:
core/src/webapp/WEB-INF/etc/spring applicationcontext-dao.xml
Log:
Use variable defined in jahia.properties
Revision Changes Path
1.11 +1 -1
jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-dao.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-dao.xml.diff?r1=1.10&r2=1.11&f=h
Index: applicationcontext-dao.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-dao.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- applicationcontext-dao.xml 7 Dec 2005 14:26:48 -0000 1.10
+++ applicationcontext-dao.xml 16 Dec 2005 16:02:53 -0000 1.11
@@ -225,7 +225,7 @@
<value>${cluster.activated}</value>
</property>
<property name="clusterProperties">
-
<value>UDP(mcast_addr=231.12.21.150;mcast_port=45020;ip_ttl=32;mcast_send_buf_size=1000000;mcast_recv_buf_size=1000000):PING(timeout=2000;num_initial_members=2):MERGE2(min_interval=5000;max_interval=10000):FD_SOCK:VERIFY_SUSPECT(timeout=1500):pbcast.NAKACK(gc_lag=50;retransmit_timeout=300,600,1200,2400,4800):pbcast.STABLE(desired_avg_gossip=20000):UNICAST(timeout=5000):FRAG(frag_size=8096;down_thread=false;up_thread=false):pbcast.GMS(join_timeout=5000;join_retry_timeout=2000;shun=false;print_local_addr=true):pbcast.STATE_TRANSFER(up_thread=false;down_thread=false)</value>
+
<value>UDP(mcast_addr=${cluster.idgenerator.multicast.ip_address};mcast_port=${cluster.idgenerator.multicast.port};ip_ttl=32;mcast_send_buf_size=1000000;mcast_recv_buf_size=1000000):PING(timeout=2000;num_initial_members=2):MERGE2(min_interval=5000;max_interval=10000):FD_SOCK:VERIFY_SUSPECT(timeout=1500):pbcast.NAKACK(gc_lag=50;retransmit_timeout=300,600,1200,2400,4800):pbcast.STABLE(desired_avg_gossip=20000):UNICAST(timeout=5000):FRAG(frag_size=8096;down_thread=false;up_thread=false):pbcast.GMS(join_timeout=5000;join_retry_timeout=2000;shun=false;print_local_addr=true):pbcast.STATE_TRANSFER(up_thread=false;down_thread=false)</value>
</property>
<property name="clusterName">
<value>idGenerator</value>
