Refactor runtime

git-svn-id: https://svn.argeo.org/slc/trunk@2633 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/runtime.xml b/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/runtime.xml
new file mode 100644 (file)
index 0000000..8ed4e4c
--- /dev/null
+++ b/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/runtime.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       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>Minimal configuration</description>
+       
+       <bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
+               <property name="scopes">
+                       <map>
+                               <entry key="execution">
+                                       <ref local="executionScope" />
+                               </entry>
+                       </map>
+               </property>
+       </bean>
+
+       <bean id="executionScope" class="org.argeo.slc.core.execution.ExecutionScope" />
+
+       <bean id="executionStack" class="org.argeo.slc.core.execution.DefaultExecutionStack"
+               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="instantiationManager" ref="instantiationManager" />
+       </bean>
+
+       <bean class="org.argeo.slc.core.execution.ExecutionAspect">
+               <property name="executionStack" ref="executionStack" />
+               <property name="executionContext" ref="executionContext" />
+       </bean>
+
+       <aop:aspectj-autoproxy />
+
+</beans>
\ No newline at end of file

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 8b3f6dbba4d742b269713c860522998a123d1b8f..6548f8a3c8ba17e574d43ae22efbb1efdd46b59a 100644 (file)
--- 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,54 +7,27 @@
        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
                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">
-               <aop:scoped-proxy />
-       </bean>
-       <bean id="executionStack" class="org.argeo.slc.core.execution.DefaultExecutionStack"
-               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="instantiationManager" ref="instantiationManager" />
-       </bean>
-
-       <bean class="org.argeo.slc.core.execution.ExecutionAspect">
-               <property name="executionStack" ref="executionStack" />
-               <property name="executionContext" ref="executionContext" />
-       </bean>
-
-       <aop:aspectj-autoproxy />
-
 </beans>
\ No newline at end of file