ExecutionContext transformed to interface; mapping from ExecutionContexts to Threads...

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.simple / src / main / resources / org / argeo / slc / core / execution / spring.xml

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 5d684fb399f6752b5f131b13e83f4d19b8113a91..319fe8fbafe17c502896edb081e3f842021a7b27 100644 (file)
--- 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
@@ -7,23 +7,46 @@
        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">
 
+       <import resource="specs.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 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>
+       
        <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 class="org.argeo.slc.core.execution.Executor" /> -->
+       
+       <bean class="org.argeo.slc.core.execution.ExecutionAspect">
+               <property name="executionContext">
+                       <ref local="executionContext" />
+               </property>
+       </bean>
 
        <aop:aspectj-autoproxy />