X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2FWEB-INF%2FapplicationContext.xml;h=7858ce7985612ead044e844e29feac3d532b0ba0;hb=e8533fdb40ffbd61574d381643dae5c8fbf61370;hp=7e429ad6b6f979ee150720a683bb4b9691aee503;hpb=38087bceeb3d6bd73fb6942c9d7bfd6a7d0abca5;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 7e429ad6b..7858ce798 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -1,31 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
-	<import resource="classpath:/org/argeo/slc/spring/templates.xml" />
-
-	<bean id="sessionFactory"
-		parent="slcTemplates.sessionFactory.hibernateTestHSQL">
-	</bean>
-
-	<bean id="treeSPathDao"
-		class="org.argeo.slc.hibernate.structure.tree.TreeSPathDaoHibernate">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
-
-	<bean id="treeSRegistryDao"
-		class="org.argeo.slc.hibernate.structure.tree.TreeSRegistryDaoHibernate">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
-
-	<bean id="testResultDao"
-		class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
-
-	<bean id="slcExecutionDao"
-		class="org.argeo.slc.hibernate.process.SlcExecutionDaoHibernate">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+	<import
+		resource="classpath:/org/argeo/slc/server/spring/servletContext.xml" />
+
+	<import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
+
+	<aop:config>
+		<aop:pointcut id="daoProcessMethods"
+			expression="execution(* org.argeo.slc.dao.process.*.*(..))" />
+		<aop:advisor advice-ref="daoAdvice"
+			pointcut-ref="daoProcessMethods" />
+	</aop:config>
+
+	<aop:config>
+		<aop:pointcut id="daoTestMethods"
+			expression="execution(* org.argeo.slc.dao.test.*.*(..))" />
+		<aop:advisor advice-ref="daoAdvice"
+			pointcut-ref="daoTestMethods" />
+	</aop:config>
+
+	<aop:config>
+		<aop:pointcut id="daoTestTreeMethods"
+			expression="execution(* org.argeo.slc.dao.test.tree.*.*(..))" />
+		<aop:advisor advice-ref="daoAdvice"
+			pointcut-ref="daoTestTreeMethods" />
+	</aop:config>
+
+	<tx:advice id="daoAdvice"
+		transaction-manager="transactionManager">
+		<tx:attributes>
+			<tx:method name="*" propagation="REQUIRED" />
+		</tx:attributes>
+	</tx:advice>
+
+
 </beans>
\ No newline at end of file