cmailleux 2005/10/10 12:48:40 CEST
Modified files:
core/src/webapp/WEB-INF/etc/spring
applicationcontext-services.xml
Log:
Remove preinterceptors in lockservice to avoid locking problems when upating
a field
Revision Changes Path
1.13 +1 -70
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.12&r2=1.13&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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- applicationcontext-services.xml 7 Oct 2005 12:45:34 -0000 1.12
+++ applicationcontext-services.xml 10 Oct 2005 10:48:40 -0000 1.13
@@ -583,76 +583,7 @@
<ref
bean="org.jahia.hibernate.manager.JahiaLockManager"/>
</property>
</bean>
- </property>
- <property name="preInterceptors">
- <list>
- <bean
class="org.springframework.aop.support.DefaultPointcutAdvisor">
- <property name="advice">
- <bean class="org.jahia.spring.advice.CacheAdvice">
- <property name="cacheName">
-
<value>LockServiceCacheAdviceBooleanMethod</value>
- </property>
- </bean>
- </property>
- <property name="pointcut">
- <bean
class="org.springframework.aop.support.NameMatchMethodPointcut">
- <property name="mappedNames">
- <list>
- <value>isAcquireable</value>
- <value>isAlreadyAcquired</value>
- <value>isAlreadyAcquiredInContext</value>
- <value>isStealed</value>
- <value>isStealedInContext</value>
- </list>
- </property>
- </bean>
- </property>
- </bean>
- <bean
class="org.springframework.aop.support.DefaultPointcutAdvisor">
- <property name="advice">
- <bean class="org.jahia.spring.advice.CacheAdvice">
- <property name="cacheName">
-
<value>LockServiceCacheAdviceLockMethod</value>
- </property>
- </bean>
- </property>
- <property name="pointcut">
- <bean
class="org.springframework.aop.support.NameMatchMethodPointcut">
- <property name="mappedNames">
- <list>
- <value>getInfo</value>
- </list>
- </property>
- </bean>
- </property>
- </bean>
- <bean
class="org.springframework.aop.support.DefaultPointcutAdvisor">
- <property name="advice">
- <bean class="org.jahia.spring.advice.UnCacheAdvice">
- <property name="cacheNames">
- <list>
-
<value>LockServiceCacheAdviceBooleanMethod</value>
-
<value>LockServiceCacheAdviceLockMethod</value>
- </list>
- </property>
- </bean>
- </property>
- <property name="pointcut">
- <bean
class="org.springframework.aop.support.NameMatchMethodPointcut">
- <property name="mappedNames">
- <list>
- <value>acquire</value>
- <value>nuke</value>
- <value>release</value>
- <value>steal</value>
- <value>reserve</value>
- </list>
- </property>
- </bean>
- </property>
- </bean>
- </list>
- </property>
+ </property>
</bean>
<bean id="CategoryService" parent="txProxyTemplate">
<property name="target">
