Author: ktlili
Date: Wed Nov 28 10:18:17 2007
New Revision: 19303
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19303&repname=
=3Djahia
Log:
- remove merging error
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/spring/ap=
plicationcontext-manager.xml
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/spr=
ing/applicationcontext-manager.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/WEB-INF/etc/spring/applicationcontext-manager.=
xml&rev=3D19303&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/spring/ap=
plicationcontext-manager.xml (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/spring/ap=
plicationcontext-manager.xml Wed Nov 28 10:18:17 2007
@@ -283,23 +283,7 @@
</property>
</bean>
=
- <bean id=3D"JahiaPageUserPropService" parent=3D"txProxyTemplate">
- <property name=3D"target">
- <bean class=3D"org.jahia.services.pagesusers.JahiaPageUserProp=
Service" parent=3D"jahiaServiceTemplate" factory-method=3D"getInstance">
- <property name=3D"pageManager">
- <ref bean=3D"org.jahia.hibernate.manager.JahiaPagesUse=
rsPropManager"/>
- </property>
- <property name=3D"cacheService">
- <ref bean=3D"JahiaCacheService"/>
- </property>
- </bean>
- </property>
- <property name=3D"preInterceptors">
- <list>
- <ref bean=3D"profilingAdvice"/>
- </list>
- </property>
- </bean>
+ =
=
<bean id=3D"org.jahia.hibernate.manager.JahiaTemplateManager" parent=
=3D"txProxyTemplate">
<property name=3D"target">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
