knguyen 2005/08/10 11:17:03 CEST
Modified files:
core/src/webapp/WEB-INF/etc/spring
applicationContext-services.xml
Log:
- fix merge
Revision Changes Path
1.12 +0 -12
jahia/core/src/webapp/WEB-INF/etc/spring/applicationContext-services.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/spring/applicationContext-services.xml.diff?r1=1.11&r2=1.12&f=h
Index: applicationContext-services.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/spring/applicationContext-services.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- applicationContext-services.xml 10 Aug 2005 08:28:44 -0000 1.11
+++ applicationContext-services.xml 10 Aug 2005 09:17:03 -0000 1.12
@@ -489,18 +489,6 @@
</bean>
</property>
</bean>
- <bean id="ClusterService" parent="txProxyTemplate">
- <property name="target">
- <bean class="org.jahia.services.cluster.JGroupsClusterService">
- <property name="channelGroupName">
- <value>JahiaCluster</value>
- </property>
- <property name="channelProperties">
-
<value>UDP:PING:FD:STABLE:NAKACK:UNICAST:FRAG:FLUSH:GMS:VIEW_ENFORCER:STATE_TRANSFER:QUEUE</value>
- </property>
- </bean>
- </property>
- </bean>
<bean id="TimeBasedPublishingService" parent="txProxyTemplate">
<property name="target">
<bean
class="org.jahia.services.timebasedpublishing.TimeBasedPublishingImplService"
factory-method="getInstance">
