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=3cfac026b5806f98429dd9c4e30661d9b5a6196a;hb=45788cedce74d877422a5aaea446f6c949bbbfb8;hp=319fe8fbafe17c502896edb081e3f842021a7b27;hpb=ae98a7536a842021e433a43427db79a18abf3a6c;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 319fe8fba..3cfac026b 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,6 +8,8 @@
 	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="tasks/core.xml" />
 
 	<bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
@@ -29,23 +31,23 @@
 		<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 local="executionContext" />
-		</property>
-		<property name="executionScope">
-			<ref local="executionScope"/>
-		</property>
+		<property name="executionContext" ref="executionContext" />
+		<property name="executionScope" ref="executionScope"/>
+		<property name="instantiationManager" ref="instantiationManager" />
 	</bean>
-	
-	<bean class="org.argeo.slc.core.execution.InstantiationPostProcessor" />
-	
-	<!-- <bean class="org.argeo.slc.core.execution.Executor" /> -->
-	
+
+	<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 local="executionContext" />
-		</property>
+		<property name="executionContext" ref="executionContext" />
 	</bean>
 
 	<aop:aspectj-autoproxy />