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=a21f302463f50cca43d6f5f8baeea5c5d8f1ce48;hb=9daa55ce316d52ffd8f30dc0d1b516ccf78a8c73;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..a21f30246 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,13 +8,16 @@
 	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">
-					<ref local="executionScope"/>
+					<ref local="executionScope" />
 				</entry>
 			</map>
 		</property>
@@ -23,29 +26,33 @@
 	<bean id="executionScope" class="org.argeo.slc.core.execution.ExecutionScope" />
 
 	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="ignoreUnresolvablePlaceholders" value="true" />
+	</bean>
 
-	<bean id="executionContext" class="org.argeo.slc.core.execution.MapExecutionContext" scope="execution">
+	<bean id="executionContext" class="org.argeo.slc.core.execution.MapExecutionContext"
+		scope="execution">
 		<aop:scoped-proxy />
 	</bean>
 
-	<bean class="org.argeo.slc.core.execution.ExecutionParameterPostProcessor" >
-		<property name="executionContext">
-			<ref local="executionContext" />
-		</property>
-		<property name="executionScope">
-			<ref local="executionScope"/>
-		</property>
+	<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" />
-	
-	<!-- <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 />