X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.simple%2Fsrc%2Fmain%2Fresources%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2Fspring.xml;h=33d4b7ef861d7257b23e96e394d7a51e16c7dd11;hb=53146ebdda3a7c0c217c44d395d270a7e9d045be;hp=8a950fcf0b9a172b7fd100dbf9ff220b317359df;hpb=743ecb28b3c0236bc91a5d0993f70477236d96fd;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/execution/spring.xml b/runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/execution/spring.xml
index 8a950fcf0..33d4b7ef8 100644
--- a/runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/execution/spring.xml
+++ b/runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/execution/spring.xml
@@ -8,25 +8,48 @@
 	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
 	<import resource="specs.xml" />
+	<import resource="templates.xml" />
+	<import resource="defaults.xml" />
+	<import resource="utils.xml" />
 	<import resource="tasks/core.xml" />
 
 	<bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
 		<property name="scopes">
 			<map>
 				<entry key="execution">
-					<bean class="org.argeo.slc.core.execution.ExecutionScope" />
+					<ref local="executionScope"/>
 				</entry>
 			</map>
 		</property>
 	</bean>
 
+	<bean id="executionScope" class="org.argeo.slc.core.execution.ExecutionScope" />
+
 	<bean
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 
-	<bean class="org.argeo.slc.core.execution.ExecutionParameterPostProcessor" />
-	<bean class="org.argeo.slc.core.execution.InstantiationPostProcessor" />
-	<bean class="org.argeo.slc.core.execution.Executor" />
-	<bean class="org.argeo.slc.core.execution.ExecutionAspect"/>
+	<bean id="executionContext" class="org.argeo.slc.core.execution.MapExecutionContext" scope="execution">
+		<aop:scoped-proxy />
+	</bean>
+
+	<bean id="instantiationManager" class="org.argeo.slc.core.execution.InstantiationManager" />
+	
+	<bean id="parameterRef" factory-bean="instantiationManager" factory-method="createRef"
+		abstract="true" />	
+
+	<bean class="org.argeo.slc.core.execution.ExecutionParameterPostProcessor" >
+		<property name="executionContext" ref="executionContext" />
+		<property name="executionScope" ref="executionScope"/>
+		<property name="instantiationManager" ref="instantiationManager" />
+	</bean>
+
+	<bean class="org.argeo.slc.core.execution.InstantiationPostProcessor">
+		<property name="instantiationManager" ref="instantiationManager" />
+	</bean>
+		
+	<bean class="org.argeo.slc.core.execution.ExecutionAspect">
+		<property name="executionContext" ref="executionContext" />
+	</bean>
 
 	<aop:aspectj-autoproxy />