X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fresources%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2Fspring.xml;h=3188e58fdc7ff9a6f428123ba974e65f269a701c;hb=afe72b7f8ba17217d13f8bd521e58db99a29c4ae;hp=a21f302463f50cca43d6f5f8baeea5c5d8f1ce48;hpb=ee6c3543a0ff9403420ce6a9c647723269f14331;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/spring.xml b/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/spring.xml
index a21f30246..3188e58fd 100644
--- a/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/spring.xml
+++ b/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/spring.xml
@@ -7,23 +7,22 @@
 	http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
 	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
+	<description>Default Capabilities</description>
+
+	<import resource="runtime.xml" />
 	<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" />
-				</entry>
-			</map>
-		</property>
+	<bean id="executionContext" class="org.argeo.slc.core.execution.MapExecutionContext"
+		scope="execution">
+		<aop:scoped-proxy />
 	</bean>
 
-	<bean id="executionScope" class="org.argeo.slc.core.execution.ExecutionScope" />
+	<bean id="executionFlowDescriptorConverter"
+		class="org.argeo.slc.core.execution.DefaultExecutionFlowDescriptorConverter"></bean>
 
 	<bean
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -31,30 +30,7 @@
 		<property name="ignoreUnresolvablePlaceholders" value="true" />
 	</bean>
 
-	<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 />
-
 </beans>
\ No newline at end of file